From 86c04ca1ede1ff2977122c5d2e4e4640b8630fc3 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Thu, 14 Oct 2021 17:41:29 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=9B=A0=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?= =?UTF-8?q?=E7=BC=96=E5=86=99=E9=94=99=E8=AF=AF=EF=BC=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?webapi=E7=BB=A7=E6=89=BFcontroller=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E6=94=B9=E5=9B=9EControllerBase=E3=80=82Aciont?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=BB=9F=E4=B8=80=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=8C=E6=96=B9=E4=BE=BFswagger?= =?UTF-8?q?=E4=B9=8B=E7=B1=BB=E7=9A=84=E5=B7=A5=E5=85=B7=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=9B=B4=E5=85=B7=E4=BD=93=E7=9A=84=E8=BF=94=E5=9B=9E=E7=BB=93?= =?UTF-8?q?=E6=9E=84=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrudTemplete/Controllers/Controller.tpl | 58 ++-- .../Advert/CoreCmsAdvertPositionController.cs | 42 +-- .../Advert/CoreCmsAdvertisementController.cs | 48 +-- .../Agent/CoreCmsAgentController.cs | 34 +-- .../Agent/CoreCmsAgentGoodsController.cs | 44 +-- .../Agent/CoreCmsAgentGradeController.cs | 46 +-- .../Agent/CoreCmsAgentOrderController.cs | 16 +- .../Agent/CoreCmsAgentSettingController.cs | 10 +- .../Article/CoreCmsArticleController.cs | 48 +-- .../Article/CoreCmsArticleTypeController.cs | 40 +-- .../Controllers/Com/DemoController.cs | 57 ---- .../Controllers/Com/LoginController.cs | 20 +- .../Controllers/Com/ToolsController.cs | 166 +++++----- .../CoreCmsDistributionController.cs | 34 +-- .../CoreCmsDistributionGradeController.cs | 96 +++--- .../CoreCmsDistributionOrderController.cs | 24 +- .../CoreCmsDistributionResultController.cs | 50 +-- .../CoreCmsDistributionSettingController.cs | 10 +- .../CoreCmsBillPaymentsController.cs | 24 +- .../Financial/CoreCmsBillRefundController.cs | 48 +-- .../Financial/CoreCmsInvoiceController.cs | 36 +-- .../Financial/CoreCmsPaymentsController.cs | 34 +-- .../Good/CoreCmsBrandController.cs | 44 +-- .../Good/CoreCmsGoodsCategoryController.cs | 48 +-- .../Good/CoreCmsGoodsCommentController.cs | 38 +-- .../Good/CoreCmsGoodsController.cs | 132 ++++---- .../Good/CoreCmsGoodsParamsController.cs | 50 +-- .../Good/CoreCmsGoodsTypeSpecController.cs | 34 +-- .../Good/CoreCmsProductsController.cs | 20 +- .../IntelligentForms/CoreCmsFormController.cs | 44 +-- .../CoreCmsFormSubmitController.cs | 56 ++-- .../Message/CoreCmsMessageCenterController.cs | 28 +- .../Message/CoreCmsSmsController.cs | 20 +- .../Message/CoreCmsSmsSettingController.cs | 10 +- .../Order/CoreCmsBillAftersalesController.cs | 36 +-- .../Order/CoreCmsBillDeliveryController.cs | 36 +-- .../Order/CoreCmsBillLadingController.cs | 46 +-- .../Order/CoreCmsBillReshipController.cs | 30 +- .../Order/CoreCmsOrderController.cs | 140 ++++----- .../PinTuan/CoreCmsPintuanRecordController.cs | 10 +- .../PinTuan/CoreCmsPintuanRuleController.cs | 46 +-- .../Promotion/CoreCmsPromotionController.cs | 144 ++++----- .../Reports/CoreCmsReportsController.cs | 36 +-- .../ServiceGoods/CoreCmsServicesController.cs | 58 ++-- .../CoreCmsUserServicesOrderController.cs | 60 ++-- .../CoreCmsUserServicesTicketController.cs | 60 ++-- ...ServicesTicketVerificationLogController.cs | 54 ++-- .../Controllers/Shop/CoreCmsAreaController.cs | 38 +-- .../Shop/CoreCmsLogisticsController.cs | 20 +- .../Shop/CoreCmsNoticeController.cs | 46 +-- .../Shop/CoreCmsPagesController.cs | 58 ++-- .../Shop/CoreCmsPagesItemsController.cs | 54 ++-- .../CoreCmsServiceDescriptionController.cs | 46 +-- .../Shop/CoreCmsSettingController.cs | 10 +- .../Controllers/Shop/CoreCmsShipController.cs | 58 ++-- .../Shop/CoreCmsStoreController.cs | 98 +++--- .../Solitaire/CoreCmsSolitaireController.cs | 46 +-- .../CoreCmsSolitaireItemsController.cs | 58 ++-- .../Stock/CoreCmsStockController.cs | 24 +- .../Stock/CoreCmsStockLogController.cs | 14 +- .../System/CodeGeneratorController.cs | 18 +- .../System/SysDictionaryController.cs | 38 +-- .../System/SysDictionaryDataController.cs | 40 +-- .../System/SysLoginRecordController.cs | 32 +- .../Controllers/System/SysMenuController.cs | 38 +-- .../System/SysNLogRecordsController.cs | 38 +-- .../System/SysOperRecordController.cs | 117 ++------ .../System/SysOrganizationController.cs | 42 +-- .../Controllers/System/SysRoleController.cs | 58 ++-- .../System/SysRoleMenuController.cs | 54 ++-- .../System/SysTaskLogController.cs | 44 +-- .../Controllers/System/SysUserController.cs | 48 +-- .../System/SysUserRoleController.cs | 54 ++-- .../User/CoreCmsUserBalanceController.cs | 24 +- .../Controllers/User/CoreCmsUserController.cs | 86 +++--- .../User/CoreCmsUserGradeController.cs | 56 ++-- .../User/CoreCmsUserTocashController.cs | 24 +- .../WeChat/CoreCmsUserWeChatInfoController.cs | 54 ++-- .../CoreCmsUserWeChatMsgTemplateController.cs | 18 +- CoreCms.Net.Web.Admin/Doc.xml | 67 ++--- .../Controllers/AdvertController.cs | 12 +- .../Controllers/AgentController.cs | 50 +-- .../Controllers/ArticleController.cs | 10 +- .../Controllers/CartController.cs | 24 +- .../Controllers/CommonController.cs | 30 +- .../Controllers/CouponController.cs | 40 +-- .../Controllers/DemoController.cs | 2 +- .../Controllers/DistributionController.cs | 46 +-- .../Controllers/FormController.cs | 10 +- .../Controllers/GoodController.cs | 42 +-- .../Controllers/GroupController.cs | 10 +- .../Controllers/NoticeController.cs | 6 +- .../Controllers/OrderController.cs | 82 ++--- .../Controllers/PageController.cs | 10 +- .../Controllers/PayNotify/AliPayController.cs | 2 +- .../PayNotify/WeChatPayController.cs | 2 +- .../Controllers/PaymentsController.cs | 18 +- .../Controllers/PinTuanController.cs | 24 +- .../Controllers/ServiceController.cs | 54 ++-- .../Controllers/StoreController.cs | 54 ++-- .../Controllers/UserController.cs | 284 +++++++++--------- .../WeChatAppletsMessageController.cs | 18 +- .../WeChatOAuth/WxOpenController.cs | 2 +- 103 files changed, 2230 insertions(+), 2387 deletions(-) delete mode 100644 CoreCms.Net.Web.Admin/Controllers/Com/DemoController.cs diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/Controllers/Controller.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/Controllers/Controller.tpl index acc2635..36cd062 100644 --- a/CoreCms.Net.CodeGenerator/CrudTemplete/Controllers/Controller.tpl +++ b/CoreCms.Net.CodeGenerator/CrudTemplete/Controllers/Controller.tpl @@ -41,7 +41,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize] - public class {{ModelClassName}}Controller : Controller + public class {{ModelClassName}}Controller : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly I{{ModelClassName}}Services _{{ModelClassName}}Services; @@ -65,7 +65,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -149,7 +149,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -161,11 +161,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -177,11 +177,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -194,10 +194,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody]{{ModelClassName}} entity) + public async Task DoCreate([FromBody]{{ModelClassName}} entity) { var jm = await _{{ModelClassName}}Services.InsertAsync(entity); - return Json(jm); + return jm; } #endregion @@ -210,7 +210,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody]FMIntId entity) + public async Task GetEdit([FromBody]FMIntId entity) { var jm = new AdminUiCallBack(); @@ -218,12 +218,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -236,10 +236,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody]{{ModelClassName}} entity) + public async Task DoEdit([FromBody]{{ModelClassName}} entity) { var jm = await _{{ModelClassName}}Services.UpdateAsync(entity); - return Json(jm); + return jm; } #endregion @@ -252,7 +252,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody]FMIntId entity) + public async Task DoDelete([FromBody]FMIntId entity) { var jm = new AdminUiCallBack(); @@ -260,11 +260,11 @@ namespace CoreCms.Net.Web.Admin.Controllers if (!model) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } jm = await _{{ModelClassName}}Services.DeleteByIdAsync(entity.id); - return Json(jm); + return jm; } #endregion @@ -277,10 +277,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除")] - public async Task DoBatchDelete([FromBody]FMArrayIntIds entity) + public async Task DoBatchDelete([FromBody]FMArrayIntIds entity) { var jm = await _{{ModelClassName}}Services.DeleteByIdsAsync(entity.id); - return Json(jm); + return jm; } #endregion @@ -294,7 +294,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody]FMIntId entity) + public async Task GetDetails([FromBody]FMIntId entity) { var jm = new AdminUiCallBack(); @@ -302,12 +302,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -320,7 +320,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody]FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody]FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -370,7 +370,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -382,7 +382,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -474,7 +474,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -488,7 +488,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置{{field.ColumnDescription}}")] - public async Task DoSet{{field.DbColumnName}}([FromBody]FMUpdateBoolDataByIntId entity) + public async Task DoSet{{field.DbColumnName}}([FromBody]FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -496,7 +496,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.{{field.DbColumnName}} = (bool)entity.data; @@ -504,7 +504,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion {% endif %}{% endfor %} diff --git a/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertPositionController.cs b/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertPositionController.cs index cd11f93..0ae67e0 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertPositionController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertPositionController.cs @@ -38,7 +38,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsAdvertPositionController : Controller + public class CoreCmsAdvertPositionController : ControllerBase { private readonly ICoreCmsAdvertPositionServices _coreCmsAdvertPositionServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -63,7 +63,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -174,7 +174,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -188,11 +188,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -206,14 +206,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; var data = EnumHelper.EnumToList(); jm.data = data; - return Json(jm); + return jm; } #endregion @@ -228,7 +228,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsAdvertPosition entity) + public async Task DoCreate([FromBody] CoreCmsAdvertPosition entity) { var jm = new AdminUiCallBack(); @@ -238,7 +238,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure; - return Json(jm); + return jm; } #endregion @@ -253,7 +253,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -261,7 +261,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var advertTemplateCode = EnumHelper.EnumToList(); @@ -273,7 +273,7 @@ namespace CoreCms.Net.Web.Admin.Controllers advertTemplateCode }; - return Json(jm); + return jm; } #endregion @@ -288,7 +288,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsAdvertPosition entity) + public async Task DoEdit([FromBody] CoreCmsAdvertPosition entity) { var jm = new AdminUiCallBack(); @@ -296,7 +296,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -311,7 +311,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -326,7 +326,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -334,13 +334,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _coreCmsAdvertPositionServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } @@ -356,7 +356,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置状态")] - public async Task DoSetisEnable([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisEnable([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -364,7 +364,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isEnable = entity.data; @@ -373,7 +373,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertisementController.cs b/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertisementController.cs index 6bbcffc..80ef1ab 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertisementController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertisementController.cs @@ -38,7 +38,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsAdvertisementController : Controller + public class CoreCmsAdvertisementController : ControllerBase { private readonly ICoreCmsAdvertisementServices _coreCmsAdvertisementServices; private readonly ICoreCmsAdvertPositionServices _coreCmsAdvertPositionServices; @@ -81,7 +81,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -207,7 +207,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -221,7 +221,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -230,7 +230,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { types }; - return Json(jm); + return jm; } #endregion @@ -244,7 +244,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public async Task GetCreate() + public async Task GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -256,7 +256,7 @@ namespace CoreCms.Net.Web.Admin.Controllers advertPosition, types }; - return Json(jm); + return jm; } #endregion @@ -271,7 +271,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsAdvertisement entity) + public async Task DoCreate([FromBody] CoreCmsAdvertisement entity) { var jm = new AdminUiCallBack(); @@ -283,7 +283,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure; - return Json(jm); + return jm; } #endregion @@ -298,7 +298,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -306,7 +306,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -321,7 +321,7 @@ namespace CoreCms.Net.Web.Admin.Controllers }; - return Json(jm); + return jm; } #endregion @@ -336,7 +336,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsAdvertisement entity) + public async Task DoEdit([FromBody] CoreCmsAdvertisement entity) { var jm = new AdminUiCallBack(); @@ -344,7 +344,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -370,7 +370,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -385,7 +385,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -393,14 +393,14 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _coreCmsAdvertisementServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -414,7 +414,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取商品列表")] - public async Task GetGoods() + public async Task GetGoods() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -447,7 +447,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -461,7 +461,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取文章列表")] - public async Task GetArticle() + public async Task GetArticle() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -491,7 +491,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -505,7 +505,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取文章分类列表")] - public async Task GetArticleType() + public async Task GetArticleType() { var jm = new AdminUiCallBack(); //获取数据 @@ -514,7 +514,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = list; jm.code = 0; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentController.cs b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentController.cs index 86cbf84..db049e6 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsAgentController : Controller + public class CoreCmsAgentController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsAgentServices _coreCmsAgentServices; @@ -65,7 +65,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -248,7 +248,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -260,7 +260,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public async Task GetIndex() + public async Task GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -273,7 +273,7 @@ namespace CoreCms.Net.Web.Admin.Controllers grades }; - return Json(jm); + return jm; } #endregion @@ -286,7 +286,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -294,7 +294,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -307,7 +307,7 @@ namespace CoreCms.Net.Web.Admin.Controllers grades }; - return Json(jm); + return jm; } #endregion @@ -320,7 +320,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsAgent entity) + public async Task DoEdit([FromBody] CoreCmsAgent entity) { var jm = new AdminUiCallBack(); @@ -329,7 +329,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -350,7 +350,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } @@ -365,7 +365,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -373,13 +373,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (!model) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _coreCmsAgentServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -392,7 +392,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -400,7 +400,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -415,7 +415,7 @@ namespace CoreCms.Net.Web.Admin.Controllers }; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentGoodsController.cs b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentGoodsController.cs index c397440..c740ee2 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentGoodsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentGoodsController.cs @@ -41,7 +41,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsAgentGoodsController : Controller + public class CoreCmsAgentGoodsController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsAgentGoodsServices _agentGoodsServices; @@ -73,7 +73,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -174,7 +174,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -186,11 +186,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -202,7 +202,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public async Task GetCreate() + public async Task GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -215,7 +215,7 @@ namespace CoreCms.Net.Web.Admin.Controllers agentGrade }; - return Json(jm); + return jm; } #endregion @@ -228,13 +228,13 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] FMCreateAgentGood entity) + public async Task DoCreate([FromBody] FMCreateAgentGood entity) { var jm = new AdminUiCallBack(); jm = await _agentGoodsServices.InsertAsync(entity.good, entity.products); jm.data = entity; - return Json(jm); + return jm; } #endregion @@ -247,7 +247,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -255,7 +255,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -285,7 +285,7 @@ namespace CoreCms.Net.Web.Admin.Controllers allNew }; - return Json(jm); + return jm; } #endregion @@ -298,10 +298,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] FMCreateAgentGood entity) + public async Task DoEdit([FromBody] FMCreateAgentGood entity) { var jm = await _agentGoodsServices.UpdateAsync(entity.good, entity.products); - return Json(jm); + return jm; } #endregion @@ -314,11 +314,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = await _agentGoodsServices.DeleteByIdAsync(entity.id); - return Json(jm); + return jm; } #endregion @@ -331,7 +331,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -339,7 +339,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -357,7 +357,7 @@ namespace CoreCms.Net.Web.Admin.Controllers products }; - return Json(jm); + return jm; } #endregion @@ -370,7 +370,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否启用")] - public async Task DoSetisEnable([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisEnable([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -378,7 +378,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isEnable = (bool)entity.data; @@ -386,7 +386,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentGradeController.cs b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentGradeController.cs index 8ca9138..9ec8116 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentGradeController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentGradeController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsAgentGradeController : Controller + public class CoreCmsAgentGradeController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsAgentGradeServices _coreCmsAgentGradeServices; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -159,7 +159,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -171,7 +171,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -183,7 +183,7 @@ namespace CoreCms.Net.Web.Admin.Controllers }; - return Json(jm); + return jm; } #endregion @@ -195,7 +195,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -204,7 +204,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { agentDefaultSalesPriceType }; - return Json(jm); + return jm; } #endregion @@ -217,10 +217,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsAgentGrade entity) + public async Task DoCreate([FromBody] CoreCmsAgentGrade entity) { var jm = await _coreCmsAgentGradeServices.InsertAsync(entity); - return Json(jm); + return jm; } #endregion @@ -233,7 +233,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -241,7 +241,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; var agentDefaultSalesPriceType = EnumHelper.EnumToList(); @@ -251,7 +251,7 @@ namespace CoreCms.Net.Web.Admin.Controllers agentDefaultSalesPriceType }; - return Json(jm); + return jm; } #endregion @@ -264,10 +264,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsAgentGrade entity) + public async Task DoEdit([FromBody] CoreCmsAgentGrade entity) { var jm = await _coreCmsAgentGradeServices.UpdateAsync(entity); - return Json(jm); + return jm; } #endregion @@ -280,7 +280,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -288,11 +288,11 @@ namespace CoreCms.Net.Web.Admin.Controllers if (!model) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } jm = await _coreCmsAgentGradeServices.DeleteByIdAsync(entity.id); - return Json(jm); + return jm; } #endregion @@ -305,7 +305,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否默认等级")] - public async Task DoSetisDefault([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisDefault([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -313,13 +313,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isDefault = (bool)entity.data; jm = await _coreCmsAgentGradeServices.UpdateAsync(oldModel); - return Json(jm); + return jm; } #endregion @@ -332,7 +332,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否自动升级")] - public async Task DoSetisAutoUpGrade([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisAutoUpGrade([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -340,13 +340,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isAutoUpGrade = (bool)entity.data; jm = await _coreCmsAgentGradeServices.UpdateAsync(oldModel); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentOrderController.cs index 962d907..23f861a 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentOrderController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentOrderController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsAgentOrderController : Controller + public class CoreCmsAgentOrderController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsAgentOrderServices _CoreCmsAgentOrderServices; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -180,7 +180,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -192,7 +192,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -203,7 +203,7 @@ namespace CoreCms.Net.Web.Admin.Controllers agentOrderSettlementStatus }; - return Json(jm); + return jm; } #endregion @@ -216,7 +216,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -224,12 +224,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentSettingController.cs b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentSettingController.cs index ee76d17..ffff702 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentSettingController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Agent/CoreCmsAgentSettingController.cs @@ -38,7 +38,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsAgentSettingController : Controller + public class CoreCmsAgentSettingController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsSettingServices _coreCmsSettingServices; @@ -62,7 +62,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public async Task GetIndex() + public async Task GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -75,7 +75,7 @@ namespace CoreCms.Net.Web.Admin.Controllers filesStorageOptionsType }; - return Json(jm); + return jm; } #endregion @@ -88,10 +88,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("保存提交")] - public async Task DoSave([FromBody] FMCoreCmsSettingDoSaveModel model) + public async Task DoSave([FromBody] FMCoreCmsSettingDoSaveModel model) { var jm = await _coreCmsSettingServices.UpdateAsync(model); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleController.cs b/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleController.cs index 525c443..b1510ce 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleController.cs @@ -36,7 +36,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsArticleController : Controller + public class CoreCmsArticleController : ControllerBase { private readonly ICoreCmsArticleServices _coreCmsArticleServices; private readonly ICoreCmsArticleTypeServices _coreCmsArticleTypeServices; @@ -67,7 +67,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -222,7 +222,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion 获取列表============================================================ @@ -236,7 +236,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public async Task GetIndex() + public async Task GetIndex() { //返回数据 @@ -247,7 +247,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { categories }; - return Json(jm); + return jm; } #endregion 首页数据============================================================ @@ -261,7 +261,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public async Task GetCreate() + public async Task GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -272,7 +272,7 @@ namespace CoreCms.Net.Web.Admin.Controllers categories }; - return Json(jm); + return jm; } #endregion 创建数据============================================================ @@ -287,7 +287,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsArticle entity) + public async Task DoCreate([FromBody] CoreCmsArticle entity) { var jm = new AdminUiCallBack(); @@ -297,7 +297,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure; - return Json(jm); + return jm; } #endregion 创建提交============================================================ @@ -312,7 +312,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -320,7 +320,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -332,7 +332,7 @@ namespace CoreCms.Net.Web.Admin.Controllers model }; - return Json(jm); + return jm; } #endregion 编辑数据============================================================ @@ -347,7 +347,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsArticle entity) + public async Task DoEdit([FromBody] CoreCmsArticle entity) { var jm = new AdminUiCallBack(); @@ -355,7 +355,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -377,7 +377,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion 编辑提交============================================================ @@ -392,7 +392,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -400,13 +400,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _coreCmsArticleServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion 删除数据============================================================ @@ -421,7 +421,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否发布")] - public async Task DoSetisPub([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisPub([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -429,7 +429,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isPub = entity.data; @@ -438,7 +438,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion 设置是否发布============================================================ @@ -453,7 +453,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否删除")] - public async Task DoSetisDel([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisDel([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -461,7 +461,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isDel = entity.data; @@ -470,7 +470,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion 设置是否删除============================================================ diff --git a/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleTypeController.cs b/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleTypeController.cs index e5910dd..1bee497 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleTypeController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleTypeController.cs @@ -38,7 +38,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsArticleTypeController : Controller + public class CoreCmsArticleTypeController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsArticleTypeServices _coreCmsArticleTypeServices; @@ -68,7 +68,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); @@ -78,7 +78,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = list; jm.code = 0; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -90,11 +90,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -106,7 +106,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public async Task GetCreate() + public async Task GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -116,7 +116,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { categories = ArticleHelper.GetTree(categories) }; - return Json(jm); + return jm; } #endregion @@ -129,7 +129,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsArticleType entity) + public async Task DoCreate([FromBody] CoreCmsArticleType entity) { var jm = new AdminUiCallBack(); @@ -137,7 +137,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = (bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure); - return Json(jm); + return jm; } #endregion @@ -150,7 +150,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -158,7 +158,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -169,7 +169,7 @@ namespace CoreCms.Net.Web.Admin.Controllers categories = ArticleHelper.GetTree(categories) }; - return Json(jm); + return jm; } #endregion @@ -182,7 +182,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsArticleType entity) + public async Task DoEdit([FromBody] CoreCmsArticleType entity) { var jm = new AdminUiCallBack(); @@ -190,7 +190,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 oldModel.id = entity.id; @@ -203,7 +203,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -216,7 +216,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -224,26 +224,26 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } if (await _coreCmsArticleTypeServices.ExistsAsync(p => p.parentId == entity.id)) { jm.msg = GlobalConstVars.DeleteIsHaveChildren; - return Json(jm); + return jm; } if (await _coreCmsArticleServices.ExistsAsync(p => p.typeId == entity.id)) { jm.msg = "栏目下有文章禁止删除"; - return Json(jm); + return jm; } var bl = await _coreCmsArticleTypeServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Com/DemoController.cs b/CoreCms.Net.Web.Admin/Controllers/Com/DemoController.cs deleted file mode 100644 index ded07db..0000000 --- a/CoreCms.Net.Web.Admin/Controllers/Com/DemoController.cs +++ /dev/null @@ -1,57 +0,0 @@ -/*********************************************************************** - * Project: CoreCms - * ProjectName: 核心内容管理系统 - * Web: https://www.corecms.net - * Author: 大灰灰 - * Email: jianweie@163.com - * CreateTime: 2021/1/31 21:45:10 - * Description: 暂无 - ***********************************************************************/ - -using System.IO; -using System.Threading.Tasks; -using AutoMapper; -using CoreCms.Net.Caching.AutoMate.RedisCache; -using CoreCms.Net.IServices; -using CoreCms.Net.Model.ViewModels.UI; -using CoreCms.Net.Utility.Helper; -using Essensoft.Paylink.WeChatPay; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.FileProviders; -using Microsoft.Extensions.Options; -using ToolGood.Words; - -namespace CoreCms.Net.Web.Admin.Controllers -{ - /// - /// 演示类 - /// - //[DisableCors] - public class DemoController : Controller - { - private readonly IOptions _optionsAccessor; - - /// - /// 用于测试及演示用 - /// - /// - public DemoController(IOptions optionsAccessor) - { - _optionsAccessor = optionsAccessor; - } - - - /// - /// 默认首页 - /// - /// - public IActionResult Index() - { - var outData = _optionsAccessor.Value; - - //return Content(t); - return Json(outData); - } - } -} diff --git a/CoreCms.Net.Web.Admin/Controllers/Com/LoginController.cs b/CoreCms.Net.Web.Admin/Controllers/Com/LoginController.cs index 9474772..177c709 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Com/LoginController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Com/LoginController.cs @@ -39,7 +39,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [Route("api/[controller]/[action]")] [AllowAnonymous] - public class LoginController : Controller + public class LoginController : ControllerBase { private readonly PermissionRequirement _permissionRequirement; private readonly IHttpContextAccessor _httpContextAccessor; @@ -73,14 +73,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// /// [HttpPost] - public async Task GetJwtToken([FromBody] FMLogin model) + public async Task GetJwtToken([FromBody] FMLogin model) { var jm = new AdminUiCallBack(); if (string.IsNullOrEmpty(model.userName) || string.IsNullOrEmpty(model.password)) { jm.msg = "用户名或密码不能为空"; - return Json(jm); + return jm; } model.password = CommonHelper.Md5For32(model.password); @@ -91,7 +91,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (user.state == 1) { jm.msg = "您的账户已经被冻结,请联系管理员解锁"; - return Json(jm); + return jm; } var userRoles = await _sysUserServices.GetUserRoleNameStr(model.userName, model.password); //如果是基于用户的授权策略，这里要添加用户;如果是基于角色的授权策略，这里要添加角色 @@ -147,7 +147,7 @@ namespace CoreCms.Net.Web.Admin.Controllers log.createTime = DateTime.Now; await _sysLoginRecordRepository.InsertAsync(log); - return Json(jm); + return jm; } else { @@ -165,7 +165,7 @@ namespace CoreCms.Net.Web.Admin.Controllers await _sysLoginRecordRepository.InsertAsync(log); jm.msg = "账户密码错误"; - return Json(jm); + return jm; } } @@ -177,14 +177,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Route("RefreshToken")] - public async Task RefreshToken(string token = "") + public async Task RefreshToken(string token = "") { var jm = new AdminUiCallBack(); if (string.IsNullOrEmpty(token)) { jm.code = 1001; jm.msg = "token无效，请重新登录！"; - return Json(jm); + return jm; } var tokenModel = JwtHelper.SerializeJwt(token); if (tokenModel != null && tokenModel.Uid > 0) @@ -227,12 +227,12 @@ namespace CoreCms.Net.Web.Admin.Controllers log.createTime = DateTime.Now; await _sysLoginRecordRepository.InsertAsync(log); - return Json(jm); + return jm; } } jm.code = 1001; jm.msg = "token无效，请重新登录！"; - return Json(jm); + return jm; } } diff --git a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs index 1370f81..87aa5ad 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs @@ -53,7 +53,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [Route("api/[controller]/[action]")] [ApiController] [Authorize] - public class ToolsController : Controller + public class ToolsController : ControllerBase { private readonly ICoreCmsAreaServices _areaServices; private readonly ICodeGeneratorServices _codeGeneratorServices; @@ -154,7 +154,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// /// [HttpPost] - public async Task GetUserInfo() + public async Task GetUserInfo() { var jm = new AdminUiCallBack(); var userModel = await _sysUserServices.QueryByIdAsync(_user.ID); @@ -166,7 +166,7 @@ namespace CoreCms.Net.Web.Admin.Controllers userModel.nickName, userModel.createTime }; - return Json(jm); + return jm; } #endregion @@ -178,7 +178,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// /// [HttpPost] - public async Task GetEditUserInfo() + public async Task GetEditUserInfo() { var jm = new AdminUiCallBack(); var userModel = await _sysUserServices.QueryByIdAsync(_user.ID); @@ -202,7 +202,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.msg = "数据获取正常"; jm.data = userModel; - return Json(jm); + return jm; } #endregion @@ -214,14 +214,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// /// [HttpPost] - public async Task GetManagerRoles() + public async Task GetManagerRoles() { var jm = new AdminUiCallBack(); var roles = await _sysRoleServices.QueryAsync(); jm.code = 0; jm.msg = "数据获取正常"; jm.data = roles.Select(p => new { title = p.roleName, value = p.id }); - return Json(jm); + return jm; } #endregion @@ -233,38 +233,38 @@ namespace CoreCms.Net.Web.Admin.Controllers /// /// [HttpPost] - public async Task EditLoginUserPassWord([FromBody] FMEditLoginUserPassWord entity) + public async Task EditLoginUserPassWord([FromBody] FMEditLoginUserPassWord entity) { var jm = new AdminUiCallBack(); if (string.IsNullOrEmpty(entity.oldPassword)) { jm.msg = "请键入旧密码"; - return Json(jm); + return jm; } if (string.IsNullOrEmpty(entity.password)) { jm.msg = "请键入新密码"; - return Json(jm); + return jm; } if (string.IsNullOrEmpty(entity.repassword)) { jm.msg = "请键入新密码确认密码"; - return Json(jm); + return jm; } if (entity.password != entity.repassword) { jm.msg = "新密码与确认密码不相符"; - return Json(jm); + return jm; } if (CommonHelper.Md5For32(entity.oldPassword) == CommonHelper.Md5For32(entity.password)) { jm.msg = "新密码与旧密码相同,无需修改"; - return Json(jm); + return jm; } var userModel = await _sysUserServices.QueryByIdAsync(_user.ID); @@ -272,7 +272,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (userModel.passWord != CommonHelper.Md5For32(entity.oldPassword)) { jm.msg = "旧密码输入错误"; - return Json(jm); + return jm; } userModel.passWord = CommonHelper.Md5For32(entity.password); @@ -280,7 +280,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? "修改成功" : "修改失败"; - return Json(jm); + return jm; } #endregion @@ -292,14 +292,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// /// [HttpPost] - public async Task EditLoginUserInfo([FromBody] EditLoginUserInfo entity) + public async Task EditLoginUserInfo([FromBody] EditLoginUserInfo entity) { var jm = new AdminUiCallBack(); if (entity.trueName.Length > 4) { jm.msg = "用户真实姓名不能大于4个字符。"; - return Json(jm); + return jm; } @@ -322,7 +322,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? "修改成功" : "修改失败"; - return Json(jm); + return jm; } #endregion @@ -334,14 +334,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// /// [HttpPost] - public JsonResult GetAllControllerAndActionByAssembly() + public AdminUiCallBack GetAllControllerAndActionByAssembly() { var jm = new AdminUiCallBack(); var data = AdminsControllerPermission.GetAllControllerAndActionByAssembly(); jm.data = data.OrderBy(u => u.name).ToList(); jm.code = 0; jm.msg = "获取成功"; - return Json(jm); + return jm; } #endregion @@ -355,7 +355,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// /// [HttpPost] - public async Task UploadFiles() + public async Task UploadFiles() { var jm = new AdminUiCallBack(); @@ -368,7 +368,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (file == null) { jm.msg = "请选择文件"; - return Json(jm); + return jm; } var fileName = file.FileName; @@ -378,7 +378,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (file.Length > maxSize) { jm.msg = "上传文件大小超过限制，最大允许上传" + _filesStorageOptions.MaxSize + "M"; - return Json(jm); + return jm; } //检查文件扩展名 @@ -386,7 +386,7 @@ namespace CoreCms.Net.Web.Admin.Controllers Array.IndexOf(_filesStorageOptions.FileTypes.Split(','), fileExt.Substring(1).ToLower()) == -1) { jm.msg = "上传文件扩展名是不允许的扩展名,请上传后缀名为：" + _filesStorageOptions.FileTypes; - return Json(jm); + return jm; } var newFileName = DateTime.Now.ToString("yyyyMMddHHmmss_ffff", DateTimeFormatInfo.InvariantInfo) + fileExt; @@ -483,7 +483,7 @@ namespace CoreCms.Net.Web.Admin.Controllers }; } - return Json(jm); + return jm; } #endregion @@ -495,7 +495,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// /// [HttpPost] - public async Task UploadFilesFByBase64([FromBody] FMBase64Post entity) + public async Task UploadFilesFByBase64([FromBody] FMBase64Post entity) { var jm = new AdminUiCallBack(); @@ -506,7 +506,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (string.IsNullOrEmpty(entity.base64)) { jm.msg = "请上传合法内容"; - return Json(jm); + return jm; } entity.base64 = entity.base64.Replace("data:image/png;base64,", "").Replace("data:image/jgp;base64,", "").Replace("data:image/jpg;base64,", "").Replace("data:image/jpeg;base64,", "");//将base64头部信息替换 @@ -612,7 +612,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.otherData = _filesStorageOptions; - return Json(jm); + return jm; } #endregion @@ -624,7 +624,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// /// [HttpPost] - public async Task CkEditorUploadFiles() + public async Task CkEditorUploadFiles() { var jm = new CKEditorUploadedResult(); @@ -637,7 +637,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (file == null) { jm.error.message = "请选择文件"; - return Json(jm); + return jm; } var fileName = file.FileName; @@ -647,7 +647,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (file.Length > maxSize) { jm.error.message = "上传文件大小超过限制，最大允许上传" + _filesStorageOptions.MaxSize + "M"; - return Json(jm); + return jm; } //检查文件扩展名 @@ -655,7 +655,7 @@ namespace CoreCms.Net.Web.Admin.Controllers Array.IndexOf(_filesStorageOptions.FileTypes.Split(','), fileExt.Substring(1).ToLower()) == -1) { jm.error.message = "上传文件扩展名是不允许的扩展名,请上传后缀名为：" + _filesStorageOptions.FileTypes; - return Json(jm); + return jm; } var newFileName = DateTime.Now.ToString("yyyyMMddHHmmss_ffff", DateTimeFormatInfo.InvariantInfo) + fileExt; @@ -743,7 +743,7 @@ namespace CoreCms.Net.Web.Admin.Controllers } - return Json(jm); + return jm; } #endregion @@ -757,7 +757,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("根据id获取商品信息")] - public async Task GetGoodsByIds([FromBody] FMArrayIntIds entity) + public async Task GetGoodsByIds([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -765,7 +765,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.data = list; - return Json(jm); + return jm; } #endregion @@ -779,7 +779,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("后台生成小程序码")] - public async Task GetFormWxCode([FromBody] FMIntId entity) + public async Task GetFormWxCode([FromBody] FMIntId entity) { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -792,7 +792,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { jm.code = 1; jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var path = "pages/form/details/details?id=" + entity.id; @@ -911,7 +911,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.otherData = response; - return Json(jm); + return jm; } #endregion @@ -925,7 +925,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("后台生成小程序码")] - public async Task GetPageWxCode([FromBody] FMStringId entity) + public async Task GetPageWxCode([FromBody] FMStringId entity) { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -938,7 +938,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { jm.code = 1; jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var path = "pages/index/custom/custom?pageCode=" + entity.id; @@ -1057,7 +1057,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.otherData = response; - return Json(jm); + return jm; } #endregion @@ -1073,7 +1073,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取商品列表")] - public async Task GetGoods() + public async Task GetGoods() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -1107,7 +1107,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -1121,7 +1121,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取商品列表")] - public async Task GetProducts(FMIntId entity) + public async Task GetProducts(FMIntId entity) { var jm = new AdminUiCallBack(); @@ -1130,7 +1130,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.data = list; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -1145,7 +1145,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取文章列表")] - public async Task GetArticles() + public async Task GetArticles() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -1164,7 +1164,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -1178,7 +1178,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取智能表单列表")] - public async Task GetForms() + public async Task GetForms() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -1197,7 +1197,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -1211,7 +1211,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取文章分类列表")] - public async Task GetArticleTypes() + public async Task GetArticleTypes() { var jm = new AdminUiCallBack(); @@ -1221,7 +1221,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = list; jm.code = 0; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -1235,7 +1235,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取公告列表")] - public async Task GetNotices() + public async Task GetNotices() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -1253,7 +1253,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -1267,7 +1267,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task TagPinTuan() + public async Task TagPinTuan() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -1289,7 +1289,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -1303,7 +1303,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("供tag标签选择合法团购秒杀的时候使用")] - public async Task TagPromotions() + public async Task TagPromotions() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -1326,7 +1326,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -1340,7 +1340,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task TagServices() + public async Task TagServices() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -1364,7 +1364,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -1378,7 +1378,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取促销列表")] - public async Task GetPromotions() + public async Task GetPromotions() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -1405,7 +1405,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -1417,7 +1417,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// /// [HttpPost] - public async Task GetArea() + public async Task GetArea() { var jm = new WebApiCallBack(); @@ -1433,7 +1433,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = areaTrees; jm.msg = ids.Count.ToString(); - return Json(jm); + return jm; } #endregion @@ -1446,7 +1446,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Authorize(Permissions.Name)] - public async Task LogisticsByApi([FromBody] FMApiLogisticsByApiPost entity) + public async Task LogisticsByApi([FromBody] FMApiLogisticsByApiPost entity) { var jm = new WebApiCallBack(); @@ -1454,7 +1454,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { jm.code = 1; jm.msg = GlobalErrorCodeVars.Code13225; - return Json(jm); + return jm; } var systemLogistics = SystemSettingDictionary.GetSystemLogistics(); @@ -1463,12 +1463,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (entity.code == p.sKey) { jm.msg = p.sDescription + "不支持轨迹查询"; - return Json(jm); + return jm; } } jm = await _logisticsServices.ExpressPoll(entity.code, entity.no, entity.mobile); - return Json(jm); + return jm; } @@ -1483,7 +1483,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// /// [HttpPost] - public async Task GetNavs() + public async Task GetNavs() { var jm = new AdminUiCallBack(); @@ -1511,7 +1511,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = "数据获取正常"; jm.code = 0; - return Json(jm); + return jm; } /// @@ -1561,7 +1561,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// /// [HttpPost] - public async Task GetAreaCheckedList([FromBody] FMIntId entity) + public async Task> GetAreaCheckedList([FromBody] FMIntId entity) { var res = new List(); @@ -1601,7 +1601,7 @@ namespace CoreCms.Net.Web.Admin.Controllers res.Add(model4); } - return Json(res); + return res; } /// @@ -1609,10 +1609,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// /// [HttpPost] - public async Task GetAreaChildren([FromBody] FMIntId entity) + public async Task> GetAreaChildren([FromBody] FMIntId entity) { var list = await _areaServices.QueryListByClauseAsync(p => p.parentId == entity.id); - return Json(list); + return list; } #endregion @@ -1628,7 +1628,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取最近登录日志")] - public async Task GetSysLoginRecord() + public async Task GetSysLoginRecord() { var jm = new AdminUiCallBack(); @@ -1639,7 +1639,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -1653,7 +1653,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取全局Nlog日志")] - public async Task GetSysNLogRecords() + public async Task GetSysNLogRecords() { var jm = new AdminUiCallBack(); //获取数据 @@ -1663,7 +1663,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -1677,7 +1677,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取7天订单情况数据统计")] - public async Task GetOrdersStatistics() + public async Task GetOrdersStatistics() { var jm = new AdminUiCallBack(); @@ -1723,7 +1723,7 @@ namespace CoreCms.Net.Web.Admin.Controllers //返回数据 jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -1737,7 +1737,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取用户最新统计数据")] - public async Task GetUsersStatistics() + public async Task GetUsersStatistics() { var jm = new AdminUiCallBack(); @@ -1781,7 +1781,7 @@ namespace CoreCms.Net.Web.Admin.Controllers //返回数据 jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -1795,7 +1795,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取用户最新统计数据")] - public async Task GetBackLog() + public async Task GetBackLog() { var jm = new AdminUiCallBack(); //待支付 @@ -1832,7 +1832,7 @@ namespace CoreCms.Net.Web.Admin.Controllers - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs index e987bb5..a8ed71f 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs @@ -38,7 +38,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsDistributionController : Controller + public class CoreCmsDistributionController : ControllerBase { private readonly ICoreCmsDistributionServices _coreCmsDistributionServices; private readonly ICoreCmsUserGradeServices _userGradeServices; @@ -66,7 +66,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -212,7 +212,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -226,7 +226,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public async Task GetIndex() + public async Task GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -238,7 +238,7 @@ namespace CoreCms.Net.Web.Admin.Controllers grades }; - return Json(jm); + return jm; } #endregion @@ -253,7 +253,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -261,7 +261,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var distributionVerifyStatus = EnumHelper.EnumToList(); @@ -275,7 +275,7 @@ namespace CoreCms.Net.Web.Admin.Controllers grades }; - return Json(jm); + return jm; } #endregion @@ -290,7 +290,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsDistribution entity) + public async Task DoEdit([FromBody] CoreCmsDistribution entity) { var jm = new AdminUiCallBack(); @@ -298,7 +298,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -316,7 +316,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -331,7 +331,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -339,13 +339,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _coreCmsDistributionServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } @@ -361,7 +361,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -369,7 +369,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var distributionVerifyStatus = EnumHelper.EnumToList(); @@ -382,7 +382,7 @@ namespace CoreCms.Net.Web.Admin.Controllers grades }; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionGradeController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionGradeController.cs index 8a02f6f..625ffe5 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionGradeController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionGradeController.cs @@ -38,7 +38,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsDistributionGradeController : Controller + public class CoreCmsDistributionGradeController : ControllerBase { private readonly ICoreCmsDistributionConditionServices _coreCmsDistributionConditionServices; private readonly ICoreCmsDistributionGradeServices _coreCmsDistributionGradeServices; @@ -70,7 +70,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -164,7 +164,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -177,11 +177,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -194,11 +194,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -211,10 +211,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsDistributionGrade entity) + public async Task DoCreate([FromBody] CoreCmsDistributionGrade entity) { var jm = await _coreCmsDistributionGradeServices.InsertAsync(entity); - return Json(jm); + return jm; } #endregion @@ -228,7 +228,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -236,7 +236,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var distributionConditions = await _coreCmsDistributionConditionServices.QueryListByClauseAsync(p => p.gradeId == model.id); @@ -250,7 +250,7 @@ namespace CoreCms.Net.Web.Admin.Controllers distributionResults }; - return Json(jm); + return jm; } #endregion @@ -265,10 +265,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsDistributionGrade entity) + public async Task DoEdit([FromBody] CoreCmsDistributionGrade entity) { var jm = await _coreCmsDistributionGradeServices.UpdateAsync(entity); - return Json(jm); + return jm; } #endregion @@ -282,7 +282,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否默认等级")] - public async Task DoSetisDefault([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisDefault([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -290,13 +290,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isDefault = (bool)entity.data; jm = await _coreCmsDistributionGradeServices.UpdateAsync(oldModel); - return Json(jm); + return jm; } #endregion @@ -309,7 +309,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否自动升级")] - public async Task DoSetisAutoUpGrade([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisAutoUpGrade([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -317,13 +317,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isAutoUpGrade = (bool)entity.data; jm = await _coreCmsDistributionGradeServices.UpdateAsync(oldModel); - return Json(jm); + return jm; } #endregion @@ -336,10 +336,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = await _coreCmsDistributionGradeServices.DeleteByIdAsync(entity.id); - return Json(jm); + return jm; } #endregion @@ -355,7 +355,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetDistributionConditionPageList() + public async Task GetDistributionConditionPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -389,7 +389,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -403,7 +403,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetDistributionConditionCreate() + public AdminUiCallBack GetDistributionConditionCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -413,7 +413,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { distributionConditionsCode, }; - return Json(jm); + return jm; } #endregion @@ -428,10 +428,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoDistributionConditionCreate([FromBody] CoreCmsDistributionCondition entity) + public async Task DoDistributionConditionCreate([FromBody] CoreCmsDistributionCondition entity) { var jm = await _coreCmsDistributionConditionServices.InsertAsync(entity); - return Json(jm); + return jm; } #endregion @@ -446,7 +446,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetDistributionConditionEdit([FromBody] FMIntId entity) + public async Task GetDistributionConditionEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -454,7 +454,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var distributionConditionsCode = EnumHelper.EnumToList(); @@ -466,7 +466,7 @@ namespace CoreCms.Net.Web.Admin.Controllers distributionConditionsCode, }; - return Json(jm); + return jm; } #endregion @@ -481,10 +481,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoDistributionConditionEdit([FromBody] CoreCmsDistributionCondition entity) + public async Task DoDistributionConditionEdit([FromBody] CoreCmsDistributionCondition entity) { var jm = await _coreCmsDistributionConditionServices.UpdateAsync(entity); - return Json(jm); + return jm; } #endregion @@ -499,10 +499,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDistributionConditionDelete([FromBody] FMIntId entity) + public async Task DoDistributionConditionDelete([FromBody] FMIntId entity) { var jm = await _coreCmsDistributionConditionServices.DeleteByIdAsync(entity.id); - return Json(jm); + return jm; } #endregion @@ -518,7 +518,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetDistributionResultPageList() + public async Task GetDistributionResultPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -543,7 +543,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -557,13 +557,13 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetDistributionResultCreate() + public AdminUiCallBack GetDistributionResultCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -578,10 +578,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoDistributionResultCreate([FromBody] CoreCmsDistributionResult entity) + public async Task DoDistributionResultCreate([FromBody] CoreCmsDistributionResult entity) { var jm = await _coreCmsDistributionResultServices.InsertAsync(entity); - return Json(jm); + return jm; } #endregion @@ -596,7 +596,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetDistributionResultEdit([FromBody] FMIntId entity) + public async Task GetDistributionResultEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -604,13 +604,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -625,10 +625,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoDistributionResultEdit([FromBody] CoreCmsDistributionResult entity) + public async Task DoDistributionResultEdit([FromBody] CoreCmsDistributionResult entity) { var jm = await _coreCmsDistributionResultServices.UpdateAsync(entity); - return Json(jm); + return jm; } #endregion @@ -643,10 +643,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDistributionResultDelete([FromBody] FMIntId entity) + public async Task DoDistributionResultDelete([FromBody] FMIntId entity) { var jm = await _coreCmsDistributionResultServices.DeleteByIdAsync(entity.id); ; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs index 007e34e..967423e 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsDistributionOrderController : Controller + public class CoreCmsDistributionOrderController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsDistributionOrderServices _coreCmsDistributionOrderServices; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -201,7 +201,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -213,7 +213,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -224,7 +224,7 @@ namespace CoreCms.Net.Web.Admin.Controllers distributionOrderSettlementStatus }; - return Json(jm); + return jm; } #endregion @@ -237,7 +237,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -245,12 +245,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -263,7 +263,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -394,7 +394,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -406,7 +406,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -622,7 +622,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionResultController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionResultController.cs index 4fae2b6..4552121 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionResultController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionResultController.cs @@ -39,7 +39,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsDistributionResultController : Controller + public class CoreCmsDistributionResultController : ControllerBase { private readonly ICoreCmsDistributionResultServices _coreCmsDistributionResultServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -122,7 +122,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -136,11 +136,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -154,11 +154,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -173,10 +173,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsDistributionResult entity) + public async Task DoCreate([FromBody] CoreCmsDistributionResult entity) { var jm = await _coreCmsDistributionResultServices.InsertAsync(entity); - return Json(jm); + return jm; } #endregion @@ -191,7 +191,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -199,13 +199,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -220,10 +220,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsDistributionResult entity) + public async Task DoEdit([FromBody] CoreCmsDistributionResult entity) { var jm = await _coreCmsDistributionResultServices.UpdateAsync(entity); - return Json(jm); + return jm; } #endregion @@ -238,10 +238,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = await _coreCmsDistributionResultServices.DeleteByIdAsync(entity.id); - return Json(jm); + return jm; } #endregion @@ -256,10 +256,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除")] - public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) + public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) { var jm = await _coreCmsDistributionResultServices.DeleteByIdsAsync(entity.id); - return Json(jm); + return jm; } #endregion @@ -274,7 +274,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -282,13 +282,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -303,7 +303,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -347,7 +347,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -361,7 +361,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -420,7 +420,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionSettingController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionSettingController.cs index ca45402..225994b 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionSettingController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionSettingController.cs @@ -38,7 +38,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsDistributionSettingController : Controller + public class CoreCmsDistributionSettingController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsSettingServices _coreCmsSettingServices; @@ -62,7 +62,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public async Task GetIndex() + public async Task GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -75,7 +75,7 @@ namespace CoreCms.Net.Web.Admin.Controllers filesStorageOptionsType }; - return Json(jm); + return jm; } #endregion @@ -88,10 +88,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("保存提交")] - public async Task DoSave([FromBody] FMCoreCmsSettingDoSaveModel model) + public async Task DoSave([FromBody] FMCoreCmsSettingDoSaveModel model) { var jm = await _coreCmsSettingServices.UpdateAsync(model); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsBillPaymentsController.cs b/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsBillPaymentsController.cs index 85f7cde..9226cb3 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsBillPaymentsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsBillPaymentsController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsBillPaymentsController : Controller + public class CoreCmsBillPaymentsController : ControllerBase { private readonly ICoreCmsBillPaymentsServices _coreCmsBillPaymentsServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -66,7 +66,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -202,7 +202,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -216,7 +216,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -234,7 +234,7 @@ namespace CoreCms.Net.Web.Admin.Controllers paymentCode }; - return Json(jm); + return jm; } #endregion @@ -249,7 +249,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMStringId entity) + public async Task GetDetails([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -257,7 +257,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var paymentsStatus = EnumHelper.GetEnumDescriptionByValue(model.status); @@ -274,7 +274,7 @@ namespace CoreCms.Net.Web.Admin.Controllers }; - return Json(jm); + return jm; } #endregion @@ -289,7 +289,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayStringIds entity) + public async Task SelectExportExcel([FromBody] FMArrayStringIds entity) { var jm = new AdminUiCallBack(); @@ -350,7 +350,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -364,7 +364,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -471,7 +471,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsBillRefundController.cs b/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsBillRefundController.cs index bceb40b..e90ee64 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsBillRefundController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsBillRefundController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsBillRefundController : Controller + public class CoreCmsBillRefundController : ControllerBase { private readonly ICoreCmsBillRefundServices _coreCmsBillRefundServices; private readonly ICoreCmsUserServices _userServices; @@ -69,7 +69,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -203,7 +203,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -217,7 +217,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -232,7 +232,7 @@ namespace CoreCms.Net.Web.Admin.Controllers paymentCode }; - return Json(jm); + return jm; } #endregion @@ -247,7 +247,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMStringId entity) + public async Task GetDetails([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -255,7 +255,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var paymentsResourceTypes = EnumHelper.GetEnumDescriptionByValue(model.type); @@ -273,7 +273,7 @@ namespace CoreCms.Net.Web.Admin.Controllers model }; - return Json(jm); + return jm; } #endregion @@ -289,7 +289,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("审核退款单")] - public async Task GetAudit([FromBody] FMStringId entity) + public async Task GetAudit([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -297,7 +297,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var paymentsResourceTypes = @@ -315,7 +315,7 @@ namespace CoreCms.Net.Web.Admin.Controllers userInfo }; - return Json(jm); + return jm; } #endregion @@ -330,26 +330,26 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("提交审核结果")] - public async Task DoAudit([FromBody] FMDoAuditPost entity) + public async Task DoAudit([FromBody] FMDoAuditPost entity) { var jm = new AdminUiCallBack(); if (string.IsNullOrEmpty(entity.refundId)) { jm.msg = GlobalErrorCodeVars.Code10000; - return Json(jm); + return jm; } if (string.IsNullOrEmpty(entity.paymentCode)) { jm.msg = GlobalErrorCodeVars.Code10000; - return Json(jm); + return jm; } if (entity.status != 2 && entity.status != 4) { jm.msg = GlobalErrorCodeVars.Code10000; - return Json(jm); + return jm; } var result = @@ -360,7 +360,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = result.msg; jm.data = result.data; - return Json(jm); + return jm; } #endregion @@ -375,14 +375,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("退款失败状态再次退款")] - public async Task DoReAudit([FromBody] FMStringId entity) + public async Task DoReAudit([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); if (string.IsNullOrEmpty(entity.id)) { jm.msg = GlobalErrorCodeVars.Code13215; - return Json(jm); + return jm; } var oldModel = await _coreCmsBillRefundServices.QueryByClauseAsync(p => @@ -391,7 +391,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = GlobalErrorCodeVars.Code13224; - return Json(jm); + return jm; } var result = await _coreCmsBillRefundServices.PaymentRefund(entity.id); @@ -401,7 +401,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = result.msg; jm.data = result.data; - return Json(jm); + return jm; } #endregion @@ -417,7 +417,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayStringIds entity) + public async Task SelectExportExcel([FromBody] FMArrayStringIds entity) { var jm = new AdminUiCallBack(); @@ -477,7 +477,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -491,7 +491,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -598,7 +598,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsInvoiceController.cs b/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsInvoiceController.cs index 3cdf9f2..76f0383 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsInvoiceController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsInvoiceController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsInvoiceController : Controller + public class CoreCmsInvoiceController : ControllerBase { private readonly ICoreCmsInvoiceServices _coreCmsInvoiceServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -67,7 +67,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -198,7 +198,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -212,7 +212,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -227,7 +227,7 @@ namespace CoreCms.Net.Web.Admin.Controllers orderTaxStatus }; - return Json(jm); + return jm; } #endregion @@ -242,7 +242,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -250,7 +250,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var orderTaxCategory = EnumHelper.EnumToList(); @@ -265,7 +265,7 @@ namespace CoreCms.Net.Web.Admin.Controllers orderTaxStatus }; - return Json(jm); + return jm; } #endregion @@ -280,7 +280,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsInvoice entity) + public async Task DoEdit([FromBody] CoreCmsInvoice entity) { var jm = new AdminUiCallBack(); @@ -288,7 +288,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -305,7 +305,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -320,7 +320,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -328,14 +328,14 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _coreCmsInvoiceServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -350,7 +350,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -410,7 +410,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -424,7 +424,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -526,7 +526,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsPaymentsController.cs b/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsPaymentsController.cs index 60df23a..d62cc71 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsPaymentsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Financial/CoreCmsPaymentsController.cs @@ -37,7 +37,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsPaymentsController : Controller + public class CoreCmsPaymentsController : ControllerBase { private readonly ICoreCmsPaymentsServices _coreCmsPaymentsServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -151,7 +151,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -165,11 +165,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -184,7 +184,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -192,13 +192,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -213,7 +213,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsPayments entity) + public async Task DoEdit([FromBody] CoreCmsPayments entity) { var jm = new AdminUiCallBack(); @@ -221,7 +221,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -234,7 +234,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -249,7 +249,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否线上支付")] - public async Task DoSetisOnline([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisOnline([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -257,7 +257,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isOnline = entity.data; @@ -266,7 +266,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -281,7 +281,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否启用")] - public async Task DoSetisEnable([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisEnable([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -289,7 +289,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isEnable = entity.data; @@ -298,7 +298,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsBrandController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsBrandController.cs index 3f30beb..93f29ea 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsBrandController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsBrandController.cs @@ -37,7 +37,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsBrandController : Controller + public class CoreCmsBrandController : ControllerBase { private readonly ICoreCmsBrandServices _coreCmsBrandServices; private readonly ICoreCmsGoodsServices _goodsServices; @@ -63,7 +63,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -151,7 +151,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -165,11 +165,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -183,11 +183,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -202,7 +202,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsBrand entity) + public async Task DoCreate([FromBody] CoreCmsBrand entity) { var jm = new AdminUiCallBack(); @@ -219,7 +219,7 @@ namespace CoreCms.Net.Web.Admin.Controllers }; } - return Json(jm); + return jm; } #endregion @@ -234,7 +234,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -242,13 +242,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -263,7 +263,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsBrand entity) + public async Task DoEdit([FromBody] CoreCmsBrand entity) { var jm = new AdminUiCallBack(); @@ -271,7 +271,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 oldModel.name = entity.name; @@ -285,7 +285,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -300,7 +300,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -308,19 +308,19 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } if (await _goodsServices.ExistsAsync(p => p.brandId == model.id)) { jm.msg = "有商品关联品牌数据,禁止删除"; - return Json(jm); + return jm; } var bl = await _coreCmsBrandServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } @@ -336,7 +336,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否显示")] - public async Task DoSetisShow([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisShow([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -344,7 +344,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isShow = entity.data; @@ -354,7 +354,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs index 1a020df..180e66c 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsGoodsCategoryController : Controller + public class CoreCmsGoodsCategoryController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsGoodsCategoryServices _coreCmsGoodsCategoryServices; @@ -68,7 +68,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); //获取数据 @@ -78,7 +78,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = list; jm.code = 0; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -90,11 +90,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -106,7 +106,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public async Task GetCreate() + public async Task GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -116,7 +116,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { categories = GoodsHelper.GetTree(categories), }; - return Json(jm); + return jm; } #endregion @@ -129,7 +129,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsGoodsCategory entity) + public async Task DoCreate([FromBody] CoreCmsGoodsCategory entity) { var jm = new AdminUiCallBack(); @@ -147,7 +147,7 @@ namespace CoreCms.Net.Web.Admin.Controllers }; } - return Json(jm); + return jm; } #endregion @@ -160,7 +160,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -168,7 +168,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -180,7 +180,7 @@ namespace CoreCms.Net.Web.Admin.Controllers categories = GoodsHelper.GetTree(categories), }; - return Json(jm); + return jm; } #endregion @@ -193,7 +193,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsGoodsCategory entity) + public async Task DoEdit([FromBody] CoreCmsGoodsCategory entity) { var jm = new AdminUiCallBack(); @@ -201,13 +201,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } if (entity.id == entity.parentId) { jm.msg = "上级不能为本类"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -225,7 +225,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -238,7 +238,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -246,26 +246,26 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } if (await _coreCmsGoodsCategoryServices.ExistsAsync(p => p.parentId == entity.id)) { jm.msg = GlobalConstVars.DeleteIsHaveChildren; - return Json(jm); + return jm; } if (await _goodsServices.ExistsAsync(p => p.goodsCategoryId == entity.id && !p.isDel)) { jm.msg = "有商品关联此栏目,禁止删除"; - return Json(jm); + return jm; } var result = await _coreCmsGoodsCategoryServices.DeleteByIdAsync(entity.id); var bl = result.code == 0; jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -279,7 +279,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否显示")] - public async Task DoSetisShow([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisShow([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -287,7 +287,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isShow = (bool)entity.data; @@ -296,7 +296,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCommentController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCommentController.cs index b7ab728..b3178b5 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCommentController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCommentController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsGoodsCommentController : Controller + public class CoreCmsGoodsCommentController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsGoodsCommentServices _coreCmsGoodsCommentServices; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -236,7 +236,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -248,11 +248,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -265,7 +265,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -273,12 +273,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -291,10 +291,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] FMIntId entity) + public async Task DoEdit([FromBody] FMIntId entity) { var jm = await _coreCmsGoodsCommentServices.Reply(entity.id, entity.data.ToString()); - return Json(jm); + return jm; } #endregion @@ -307,7 +307,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -315,11 +315,11 @@ namespace CoreCms.Net.Web.Admin.Controllers if (!model) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } jm = await _coreCmsGoodsCommentServices.DeleteByIdAsync(entity.id); - return Json(jm); + return jm; } #endregion @@ -332,7 +332,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -340,12 +340,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -358,7 +358,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置前台显示")] - public async Task DoSetisDisplay([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisDisplay([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -366,13 +366,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isDisplay = (bool)entity.data; jm = await _coreCmsGoodsCommentServices.UpdateAsync(oldModel); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs index 1614931..6a519b9 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs @@ -41,7 +41,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsGoodsController : Controller + public class CoreCmsGoodsController : ControllerBase { private readonly ICoreCmsBrandServices _brandServices; private readonly ICoreCmsGoodsCategoryExtendServices _categoryExtendServices; @@ -104,7 +104,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -306,7 +306,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -320,7 +320,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public async Task GetIndex() + public async Task GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -368,7 +368,7 @@ namespace CoreCms.Net.Web.Admin.Controllers productsDistributionType }; - return Json(jm); + return jm; } #endregion @@ -382,7 +382,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public async Task GetCreate() + public async Task GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -415,7 +415,7 @@ namespace CoreCms.Net.Web.Admin.Controllers skuList }; - return Json(jm); + return jm; } #endregion @@ -430,10 +430,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] FMGoodsInsertModel entity) + public async Task DoCreate([FromBody] FMGoodsInsertModel entity) { var jm = await _coreCmsGoodsServices.InsertAsync(entity); - return Json(jm); + return jm; } #endregion @@ -447,7 +447,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit(int id) + public async Task GetEdit(int id) { var jm = new AdminUiCallBack(); @@ -456,7 +456,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { jm.msg = "不存在此信息"; jm.data = id; - return Json(jm); + return jm; } jm.code = 0; @@ -549,7 +549,7 @@ namespace CoreCms.Net.Web.Admin.Controllers }; - return Json(jm); + return jm; } #endregion @@ -564,10 +564,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] FMGoodsInsertModel entity) + public async Task DoEdit([FromBody] FMGoodsInsertModel entity) { var jm = await _coreCmsGoodsServices.UpdateAsync(entity); - return Json(jm); + return jm; } #endregion @@ -582,7 +582,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -590,7 +590,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } model.isDel = true; @@ -603,7 +603,7 @@ namespace CoreCms.Net.Web.Admin.Controllers } jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } @@ -619,7 +619,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -627,13 +627,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -648,7 +648,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否虚拟商品")] - public async Task DoSetisNomalVirtual([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisNomalVirtual([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -656,7 +656,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isNomalVirtual = entity.data; @@ -665,7 +665,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -680,7 +680,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否上架")] - public async Task DoSetisMarketable([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisMarketable([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -688,7 +688,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isMarketable = entity.data; @@ -697,7 +697,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -712,7 +712,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否推荐")] - public async Task DoSetisRecommend([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisRecommend([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -720,7 +720,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isRecommend = entity.data; @@ -729,7 +729,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -744,7 +744,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否热门")] - public async Task DoSetisHot([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisHot([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -752,7 +752,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isHot = entity.data; @@ -761,7 +761,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -776,7 +776,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否删除")] - public async Task DoSetisDel([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisDel([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -784,7 +784,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isDel = entity.data; @@ -793,7 +793,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -808,14 +808,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取商品SKU明细")] - public async Task GetSkuDetail([FromBody] FMArrayIntIds entity) + public async Task GetSkuDetail([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); if (entity.id.Length <= 0) { jm.msg = "请提交SKU模型"; - return Json(jm); + return jm; } var typeSpecs = await _typeSpecServices.QueryListByClauseAsync(p => entity.id.Contains(p.id)); @@ -828,7 +828,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -843,7 +843,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("根据属性值生成货品html")] - public JsonResult GetSpecHtml([FromBody] FmSerializeArray model) + public AdminUiCallBack GetSpecHtml([FromBody] FmSerializeArray model) { var jm = new AdminUiCallBack(); @@ -851,7 +851,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (!list.Any()) { jm.msg = "提交数据获取失败"; - return Json(jm); + return jm; } var newSpecs = list.Where(p => p.name.Contains("newSpec.")).ToList(); @@ -860,7 +860,7 @@ namespace CoreCms.Net.Web.Admin.Controllers t.value = t.value.Trim(); if (GoodsHelper.FilterChar(t.value) == false) continue; jm.msg = "自定义规格不符合支持规则格式"; - return Json(jm); + return jm; } var oldProducts = list.Where(p => p.name.Contains("product[spesDesc][]")).Select(p => p.value).ToList(); @@ -978,7 +978,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -993,10 +993,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除")] - public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) + public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) { var jm = await _coreCmsGoodsServices.DeleteByIdsAsync(entity.id); - return Json(jm); + return jm; } #endregion @@ -1011,10 +1011,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量上架")] - public async Task DoBatchMarketableUp([FromBody] FMArrayIntIds entity) + public async Task DoBatchMarketableUp([FromBody] FMArrayIntIds entity) { var jm = await _coreCmsGoodsServices.DoBatchMarketableUp(entity.id); - return Json(jm); + return jm; } #endregion @@ -1029,10 +1029,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量下架")] - public async Task DoBatchMarketableDown([FromBody] FMArrayIntIds entity) + public async Task DoBatchMarketableDown([FromBody] FMArrayIntIds entity) { var jm = await _coreCmsGoodsServices.DoBatchMarketableDown(entity.id); - return Json(jm); + return jm; } #endregion @@ -1048,7 +1048,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量修改价格")] - public JsonResult GetBatchModifyPrice([FromBody] FMArrayIntIds entity) + public AdminUiCallBack GetBatchModifyPrice([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -1071,7 +1071,7 @@ namespace CoreCms.Net.Web.Admin.Controllers priceType }; - return Json(jm); + return jm; } @@ -1083,10 +1083,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量修改价格提交")] - public async Task DoBatchModifyPrice([FromBody] FmBatchModifyPrice entity) + public async Task DoBatchModifyPrice([FromBody] FmBatchModifyPrice entity) { var jm = await _coreCmsGoodsServices.DoBatchModifyPrice(entity); - return Json(jm); + return jm; } #endregion @@ -1102,7 +1102,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量修改库存")] - public JsonResult GetBatchModifyStock([FromBody] FMArrayIntIds entity) + public AdminUiCallBack GetBatchModifyStock([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -1112,7 +1112,7 @@ namespace CoreCms.Net.Web.Admin.Controllers entity }; - return Json(jm); + return jm; } @@ -1124,10 +1124,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量修改库存提交")] - public async Task DoBatchModifyStock([FromBody] FmBatchModifyStock entity) + public async Task DoBatchModifyStock([FromBody] FmBatchModifyStock entity) { var jm = await _coreCmsGoodsServices.DoBatchModifyStock(entity); - return Json(jm); + return jm; } #endregion @@ -1142,14 +1142,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置标签")] - public async Task GetLabel([FromBody] FMArrayIntIds entity) + public async Task GetLabel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); var model = await _labelServices.QueryAsync(); if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -1159,7 +1159,7 @@ namespace CoreCms.Net.Web.Admin.Controllers ids = entity }; - return Json(jm); + return jm; } // POST: Admins/CoreCmsGoods/DoSetLabel @@ -1170,10 +1170,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置标签提交")] - public async Task DoSetLabel([FromBody] FmSetLabel entity) + public async Task DoSetLabel([FromBody] FmSetLabel entity) { var jm = await _coreCmsGoodsServices.DoSetLabel(entity); - return Json(jm); + return jm; } #endregion @@ -1189,7 +1189,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("去除标签")] - public async Task GetDeleteLabel([FromBody] FMArrayIntIds entity) + public async Task GetDeleteLabel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -1197,7 +1197,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var labelIds = model.Select(p => p.labelIds).ToList(); @@ -1218,7 +1218,7 @@ namespace CoreCms.Net.Web.Admin.Controllers }; - return Json(jm); + return jm; } // POST: Admins/CoreCmsGoods/DoDeleteLabel @@ -1229,10 +1229,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("去除标签提交")] - public async Task DoDeleteLabel([FromBody] FmSetLabel entity) + public async Task DoDeleteLabel([FromBody] FmSetLabel entity) { var jm = await _coreCmsGoodsServices.DoDeleteLabel(entity); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsParamsController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsParamsController.cs index a9edc77..34c3776 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsParamsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsParamsController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsGoodsParamsController : Controller + public class CoreCmsGoodsParamsController : ControllerBase { private readonly ICoreCmsGoodsParamsServices _coreCmsGoodsParamsServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -165,7 +165,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -179,7 +179,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -188,7 +188,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { goodsParamTypes }; - return Json(jm); + return jm; } #endregion @@ -202,7 +202,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -211,7 +211,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { goodsParamTypes }; - return Json(jm); + return jm; } #endregion @@ -226,7 +226,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsGoodsParams entity) + public async Task DoCreate([FromBody] CoreCmsGoodsParams entity) { var jm = new AdminUiCallBack(); @@ -245,7 +245,7 @@ namespace CoreCms.Net.Web.Admin.Controllers }; } - return Json(jm); + return jm; } #endregion @@ -260,7 +260,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -268,7 +268,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -279,7 +279,7 @@ namespace CoreCms.Net.Web.Admin.Controllers goodsParamTypes }; - return Json(jm); + return jm; } #endregion @@ -294,7 +294,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsGoodsParams entity) + public async Task DoEdit([FromBody] CoreCmsGoodsParams entity) { var jm = new AdminUiCallBack(); @@ -302,7 +302,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -316,7 +316,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -331,7 +331,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -339,13 +339,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _coreCmsGoodsParamsServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -360,7 +360,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -368,13 +368,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -389,7 +389,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -438,7 +438,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -452,7 +452,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -532,7 +532,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsTypeSpecController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsTypeSpecController.cs index fd42d02..32a2fd0 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsTypeSpecController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsTypeSpecController.cs @@ -37,7 +37,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsGoodsTypeSpecController : Controller + public class CoreCmsGoodsTypeSpecController : ControllerBase { private readonly ICoreCmsGoodsTypeSpecServices _coreCmsGoodsTypeSpecServices; private readonly ICoreCmsGoodsTypeSpecValueServices _valueServices; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -128,7 +128,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -142,11 +142,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -160,11 +160,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -179,7 +179,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] FmGoodsTypeSpecInsert entity) + public async Task DoCreate([FromBody] FmGoodsTypeSpecInsert entity) { var jm = await _coreCmsGoodsTypeSpecServices.InsertAsync(entity); @@ -193,7 +193,7 @@ namespace CoreCms.Net.Web.Admin.Controllers }; } - return Json(jm); + return jm; } #endregion @@ -208,14 +208,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); var model = await _coreCmsGoodsTypeSpecServices.QueryByIdAsync(entity.id); if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var values = @@ -225,7 +225,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -240,10 +240,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] FmGoodsTypeSpecUpdate entity) + public async Task DoEdit([FromBody] FmGoodsTypeSpecUpdate entity) { var jm = await _coreCmsGoodsTypeSpecServices.UpdateAsync(entity); - return Json(jm); + return jm; } #endregion @@ -258,7 +258,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -266,11 +266,11 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } jm = await _coreCmsGoodsTypeSpecServices.DeleteByIdAsync(entity.id); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsProductsController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsProductsController.cs index a59ea61..4059bc9 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsProductsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsProductsController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsProductsController : Controller + public class CoreCmsProductsController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsProductsServices _coreCmsProductsServices; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -139,7 +139,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -151,11 +151,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -169,7 +169,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -177,12 +177,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -195,11 +195,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置库存")] - public async Task DoSetStock([FromBody] FMUpdateIntegerDataByIntId entity) + public async Task DoSetStock([FromBody] FMUpdateIntegerDataByIntId entity) { var jm = await _coreCmsProductsServices.EditStock(entity.id, entity.data); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/IntelligentForms/CoreCmsFormController.cs b/CoreCms.Net.Web.Admin/Controllers/IntelligentForms/CoreCmsFormController.cs index 60caa4a..78fef04 100644 --- a/CoreCms.Net.Web.Admin/Controllers/IntelligentForms/CoreCmsFormController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/IntelligentForms/CoreCmsFormController.cs @@ -39,7 +39,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsFormController : Controller + public class CoreCmsFormController : ControllerBase { private readonly ICoreCmsFormServices _coreCmsFormServices; private readonly ICoreCmsFormItemServices _formItemServices; @@ -69,7 +69,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -255,7 +255,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -269,7 +269,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -280,7 +280,7 @@ namespace CoreCms.Net.Web.Admin.Controllers formTypes }; - return Json(jm); + return jm; } #endregion @@ -294,7 +294,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -312,7 +312,7 @@ namespace CoreCms.Net.Web.Admin.Controllers formValidationTypes }; - return Json(jm); + return jm; } #endregion @@ -327,10 +327,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] FMForm entity) + public async Task DoCreate([FromBody] FMForm entity) { var jm = await _coreCmsFormServices.InsertAsync(entity); - return Json(jm); + return jm; } #endregion @@ -345,7 +345,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -353,7 +353,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -373,7 +373,7 @@ namespace CoreCms.Net.Web.Admin.Controllers items }; - return Json(jm); + return jm; } #endregion @@ -388,14 +388,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] FMForm entity) + public async Task DoEdit([FromBody] FMForm entity) { var jm = new AdminUiCallBack(); //事物处理过程结束 jm = await _coreCmsFormServices.UpdateAsync(entity); - return Json(jm); + return jm; } #endregion @@ -410,11 +410,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = await _coreCmsFormServices.DeleteByIdAsync(entity.id); - return Json(jm); + return jm; } @@ -430,7 +430,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -438,7 +438,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -457,7 +457,7 @@ namespace CoreCms.Net.Web.Admin.Controllers sumSubmit }; - return Json(jm); + return jm; } #endregion @@ -472,7 +472,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否需要登录")] - public async Task DoSetisLogin([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisLogin([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -480,7 +480,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isLogin = entity.data; @@ -489,7 +489,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? "设置成功" : "设置失败"; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/IntelligentForms/CoreCmsFormSubmitController.cs b/CoreCms.Net.Web.Admin/Controllers/IntelligentForms/CoreCmsFormSubmitController.cs index 5effc80..54e392e 100644 --- a/CoreCms.Net.Web.Admin/Controllers/IntelligentForms/CoreCmsFormSubmitController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/IntelligentForms/CoreCmsFormSubmitController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsFormSubmitController : Controller + public class CoreCmsFormSubmitController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsFormSubmitServices _coreCmsFormSubmitServices; @@ -69,7 +69,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -193,7 +193,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -205,7 +205,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public async Task GetIndex() + public async Task GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -216,7 +216,7 @@ namespace CoreCms.Net.Web.Admin.Controllers forms }; - return Json(jm); + return jm; } #endregion @@ -229,7 +229,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -237,12 +237,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -255,7 +255,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -263,11 +263,11 @@ namespace CoreCms.Net.Web.Admin.Controllers if (!model) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } jm = await _coreCmsFormSubmitServices.DeleteByIdAsync(entity.id); - return Json(jm); + return jm; } #endregion @@ -280,7 +280,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -288,7 +288,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -298,7 +298,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { jm.msg = "表单信息获取失败"; jm.data = getResult; - return Json(jm); + return jm; } if (formModel.Items.Any()) @@ -340,7 +340,7 @@ namespace CoreCms.Net.Web.Admin.Controllers formModel.Items }; - return Json(jm); + return jm; } #endregion @@ -353,7 +353,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -493,7 +493,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -505,7 +505,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -742,7 +742,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -755,7 +755,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否支付")] - public async Task DoSetpayStatus([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetpayStatus([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -763,7 +763,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.payStatus = (bool)entity.data; @@ -773,7 +773,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -786,7 +786,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否处理")] - public async Task DoSetstatus([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetstatus([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -794,7 +794,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.status = (bool)entity.data; @@ -803,7 +803,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -816,7 +816,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("更新反馈")] - public async Task DoSetFeedback([FromBody] FMUpdateStringDataByIntId entity) + public async Task DoSetFeedback([FromBody] FMUpdateStringDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -824,7 +824,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.feedback = entity.data.ToString(); @@ -833,7 +833,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsMessageCenterController.cs b/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsMessageCenterController.cs index b4e474c..d9a556f 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsMessageCenterController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsMessageCenterController.cs @@ -38,7 +38,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsMessageCenterController : Controller + public class CoreCmsMessageCenterController : ControllerBase { private readonly ICoreCmsMessageCenterServices _coreCmsMessageCenterServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -65,7 +65,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -138,7 +138,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -152,7 +152,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -164,7 +164,7 @@ namespace CoreCms.Net.Web.Admin.Controllers }; - return Json(jm); + return jm; } #endregion @@ -179,7 +179,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置启用短信")] - public async Task DoSetisSms([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisSms([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -187,7 +187,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isSms = entity.data; @@ -197,7 +197,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -212,7 +212,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置启用站内消息")] - public async Task DoSetisMessage([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisMessage([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -220,7 +220,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isMessage = entity.data; @@ -230,7 +230,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -245,7 +245,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置启用微信模板消息")] - public async Task DoSetisWxTempletMessage([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisWxTempletMessage([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -253,7 +253,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isWxTempletMessage = entity.data; @@ -263,7 +263,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsSmsController.cs b/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsSmsController.cs index 2b3947e..26a339e 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsSmsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsSmsController.cs @@ -38,7 +38,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsSmsController : Controller + public class CoreCmsSmsController : ControllerBase { private readonly ICoreCmsSmsServices _coreCmsSmsServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -63,7 +63,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -163,7 +163,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -177,7 +177,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -190,7 +190,7 @@ namespace CoreCms.Net.Web.Admin.Controllers platformMessageTypes }; - return Json(jm); + return jm; } #endregion @@ -205,7 +205,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -213,13 +213,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _coreCmsSmsServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } @@ -235,7 +235,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除")] - public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) + public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -243,7 +243,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsSmsSettingController.cs b/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsSmsSettingController.cs index 5849e07..a3ca508 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsSmsSettingController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Message/CoreCmsSmsSettingController.cs @@ -38,7 +38,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsSmsSettingController : Controller + public class CoreCmsSmsSettingController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsSettingServices _coreCmsSettingServices; @@ -62,7 +62,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public async Task GetIndex() + public async Task GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -75,7 +75,7 @@ namespace CoreCms.Net.Web.Admin.Controllers filesStorageOptionsType }; - return Json(jm); + return jm; } #endregion @@ -88,10 +88,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("保存提交")] - public async Task DoSave([FromBody] FMCoreCmsSettingDoSaveModel model) + public async Task DoSave([FromBody] FMCoreCmsSettingDoSaveModel model) { var jm = await _coreCmsSettingServices.UpdateAsync(model); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillAftersalesController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillAftersalesController.cs index 79fd3e4..5186377 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillAftersalesController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillAftersalesController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsBillAftersalesController : Controller + public class CoreCmsBillAftersalesController : ControllerBase { private readonly ICoreCmsBillAftersalesServices _coreCmsBillAftersalesServices; private readonly ICoreCmsBillAftersalesImagesServices _imagesServices; @@ -77,7 +77,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -200,7 +200,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -214,11 +214,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -233,7 +233,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("审核数据")] - public async Task GetEdit([FromBody] FMStringId entity) + public async Task GetEdit([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -241,13 +241,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (!model.status) { jm.msg = model.msg; - return Json(jm); + return jm; } jm.code = 0; jm.data = model.data; - return Json(jm); + return jm; } #endregion @@ -262,14 +262,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("审核提交")] - public async Task DoEdit([FromBody] FMBillAftersalesAddPost entity) + public async Task DoEdit([FromBody] FMBillAftersalesAddPost entity) { var jm = new AdminUiCallBack(); if (entity.status == 0) { jm.msg = "请选择审核状态"; - return Json(jm); + return jm; } var res = await _coreCmsBillAftersalesServices.Audit(entity.aftersalesId, entity.status, entity.type, @@ -279,7 +279,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = res.data; jm.otherData = entity; - return Json(jm); + return jm; } #endregion @@ -294,7 +294,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMStringId entity) + public async Task GetDetails([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -302,7 +302,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var userModel = await _userServices.QueryByClauseAsync(p => p.id == model.userId); @@ -316,7 +316,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = model; - return Json(jm); + return jm; } #endregion @@ -331,7 +331,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayStringIds entity) + public async Task SelectExportExcel([FromBody] FMArrayStringIds entity) { var jm = new AdminUiCallBack(); @@ -388,7 +388,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -402,7 +402,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -500,7 +500,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillDeliveryController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillDeliveryController.cs index 1fbfee6..ac32aad 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillDeliveryController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillDeliveryController.cs @@ -39,7 +39,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsBillDeliveryController : Controller + public class CoreCmsBillDeliveryController : ControllerBase { private readonly ICoreCmsAreaServices _areaServices; private readonly ICoreCmsBillDeliveryServices _coreCmsBillDeliveryServices; @@ -70,7 +70,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -262,7 +262,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -276,11 +276,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -295,7 +295,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMStringId entity) + public async Task GetEdit([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -303,7 +303,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -317,7 +317,7 @@ namespace CoreCms.Net.Web.Admin.Controllers logistics }; - return Json(jm); + return jm; } #endregion @@ -332,7 +332,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsBillDelivery entity) + public async Task DoEdit([FromBody] CoreCmsBillDelivery entity) { var jm = new AdminUiCallBack(); @@ -340,7 +340,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -359,7 +359,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -374,7 +374,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMStringId entity) + public async Task GetDetails([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -382,7 +382,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } if (model.shipAreaId > 0) @@ -407,7 +407,7 @@ namespace CoreCms.Net.Web.Admin.Controllers items }; - return Json(jm); + return jm; } #endregion @@ -423,7 +423,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayStringIds entity) + public async Task SelectExportExcel([FromBody] FMArrayStringIds entity) { var jm = new AdminUiCallBack(); @@ -487,7 +487,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -501,7 +501,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -630,7 +630,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillLadingController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillLadingController.cs index 0da81cc..323abf0 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillLadingController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillLadingController.cs @@ -39,7 +39,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsBillLadingController : Controller + public class CoreCmsBillLadingController : ControllerBase { private readonly ICoreCmsBillLadingServices _coreCmsBillLadingServices; private readonly ICoreCmsStoreServices _storeServices; @@ -68,7 +68,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -221,7 +221,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -235,7 +235,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public async Task GetIndex() + public async Task GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -244,7 +244,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { stores }; - return Json(jm); + return jm; } #endregion @@ -259,7 +259,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMStringId entity) + public async Task GetEdit([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -267,7 +267,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var stores = await _storeServices.QueryAsync(); @@ -278,7 +278,7 @@ namespace CoreCms.Net.Web.Admin.Controllers stores }; - return Json(jm); + return jm; } #endregion @@ -293,7 +293,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsBillLading entity) + public async Task DoEdit([FromBody] CoreCmsBillLading entity) { var jm = new AdminUiCallBack(); @@ -301,7 +301,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -314,7 +314,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -329,7 +329,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -337,13 +337,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _coreCmsBillLadingServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } @@ -359,7 +359,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayStringIds entity) + public async Task SelectExportExcel([FromBody] FMArrayStringIds entity) { var jm = new AdminUiCallBack(); @@ -416,7 +416,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -430,7 +430,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -545,7 +545,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -560,12 +560,12 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("核销数据")] - public async Task LadingOperating([FromBody] FMStringId entity) + public async Task LadingOperating([FromBody] FMStringId entity) { var ids = entity.id.Split(","); var jm = await _coreCmsBillLadingServices.LadingOperating(ids); - return Json(jm); + return jm; } #endregion @@ -581,19 +581,19 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("核销数据")] - public async Task BatchLadingOperating([FromBody] FMArrayStringIds entity) + public async Task BatchLadingOperating([FromBody] FMArrayStringIds entity) { var jm = new AdminUiCallBack(); if (entity.id.Length == 0) { jm.msg = "请选择需要核销的数据"; - return Json(jm); + return jm; } jm = await _coreCmsBillLadingServices.LadingOperating(entity.id); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillReshipController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillReshipController.cs index d27e6de..f5c02ba 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillReshipController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillReshipController.cs @@ -41,7 +41,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsBillReshipController : Controller + public class CoreCmsBillReshipController : ControllerBase { private readonly ICoreCmsBillReshipServices _coreCmsBillReshipServices; private readonly ICoreCmsBillReshipItemServices _billReshipItemServices; @@ -73,7 +73,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -198,7 +198,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -212,7 +212,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -224,7 +224,7 @@ namespace CoreCms.Net.Web.Admin.Controllers status }; - return Json(jm); + return jm; } #endregion @@ -239,7 +239,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("确认收货")] - public async Task DoAudit([FromBody] FMStringId entity) + public async Task DoAudit([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -247,7 +247,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _coreCmsBillReshipServices.UpdateAsync( @@ -295,7 +295,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? "确认成功" : "确认失败"; - return Json(jm); + return jm; } #endregion @@ -310,7 +310,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMStringId entity) + public async Task GetDetails([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -318,7 +318,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var status = EnumHelper.EnumToList(); @@ -329,7 +329,7 @@ namespace CoreCms.Net.Web.Admin.Controllers model }; - return Json(jm); + return jm; } #endregion @@ -344,7 +344,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayStringIds entity) + public async Task SelectExportExcel([FromBody] FMArrayStringIds entity) { var jm = new AdminUiCallBack(); @@ -401,7 +401,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -415,7 +415,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -516,7 +516,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs index 57abdfe..6db6677 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs @@ -46,7 +46,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsOrderController : Controller + public class CoreCmsOrderController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsOrderServices _coreCmsOrderServices; @@ -107,7 +107,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -294,7 +294,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -306,7 +306,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public async Task GetIndex() + public async Task GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -376,7 +376,7 @@ namespace CoreCms.Net.Web.Admin.Controllers receiptType }; - return Json(jm); + return jm; } #endregion @@ -389,7 +389,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMStringId entity) + public async Task GetEdit([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -398,7 +398,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (!result.status) { jm.msg = result.msg; - return Json(jm); + return jm; } jm.code = 0; jm.data = new @@ -407,7 +407,7 @@ namespace CoreCms.Net.Web.Admin.Controllers storeList }; - return Json(jm); + return jm; } #endregion @@ -420,7 +420,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] AdminEditOrderPost entity) + public async Task DoEdit([FromBody] AdminEditOrderPost entity) { var jm = new AdminUiCallBack(); @@ -428,7 +428,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 if (entity.editType == 1) @@ -454,7 +454,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -467,14 +467,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("发货")] - public async Task GetShip([FromBody] FMArrayStringIds entity) + public async Task GetShip([FromBody] FMArrayStringIds entity) { var jm = new AdminUiCallBack(); if (entity.id.Length == 0) { jm.msg = "请选择需要发货的数据"; - return Json(jm); + return jm; } @@ -487,7 +487,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (!result.status) { jm.msg = result.msg; - return Json(jm); + return jm; } if (storeList.Any()) @@ -510,7 +510,7 @@ namespace CoreCms.Net.Web.Admin.Controllers logistics, }; - return Json(jm); + return jm; } #endregion @@ -523,7 +523,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("发货提交")] - public async Task DoShip([FromBody] AdminOrderShipPost entity) + public async Task DoShip([FromBody] AdminOrderShipPost entity) { var jm = new AdminUiCallBack(); @@ -543,7 +543,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = result.data; jm.otherData = entity; - return Json(jm); + return jm; } #endregion @@ -556,7 +556,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("秒发货")] - public async Task DoSecondsShip([FromBody] FMStringId entity) + public async Task DoSecondsShip([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -564,14 +564,14 @@ namespace CoreCms.Net.Web.Admin.Controllers if (order == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var goodItems = await _orderItemServices.QueryListByClauseAsync(p => p.orderId == entity.id); if (!goodItems.Any()) { jm.msg = "明细获取失败"; - return Json(jm); + return jm; } Dictionary items = new Dictionary(); @@ -597,7 +597,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = result.data; jm.otherData = entity; - return Json(jm); + return jm; } #endregion @@ -610,7 +610,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("支付")] - public async Task GetPay([FromBody] FMArrayStringIds entity) + public async Task GetPay([FromBody] FMArrayStringIds entity) { var jm = new AdminUiCallBack(); @@ -618,7 +618,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (type == 0 || entity.id.Length == 0) { jm.msg = "请提交合法的数据"; - return Json(jm); + return jm; } var result = await _billPaymentsServices.BatchFormatPaymentRel(entity.id, type, null); @@ -626,7 +626,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { jm.msg = result.msg; jm.data = result.data; - return Json(jm); + return jm; } //取支付方式 var payments = await _paymentsServices.QueryListByClauseAsync(p => p.isEnable, p => p.sort, OrderByType.Asc); @@ -640,7 +640,7 @@ namespace CoreCms.Net.Web.Admin.Controllers rel = result.data }; - return Json(jm); + return jm; } #endregion @@ -653,7 +653,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("提交支付")] - public async Task DoToPay([FromBody] AdminOrderDoPayPost entity) + public async Task DoToPay([FromBody] AdminOrderDoPayPost entity) { var jm = new AdminUiCallBack(); @@ -664,7 +664,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = result.status ? 0 : 1; jm.msg = result.msg; - return Json(jm); + return jm; } #endregion @@ -677,7 +677,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMStringId entity) + public async Task DoDelete([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -685,13 +685,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } //假删除 var bl = await _coreCmsOrderServices.UpdateAsync(p => new CoreCmsOrder() { isdel = true }, p => p.orderId == model.orderId); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -705,7 +705,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("还原订单")] - public async Task DoRestore([FromBody] FMStringId entity) + public async Task DoRestore([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -713,13 +713,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } //还原 var bl = await _coreCmsOrderServices.UpdateAsync(p => new CoreCmsOrder() { isdel = false }, p => p.orderId == model.orderId); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -733,7 +733,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("判断是否存在售后")] - public async Task GetDoHaveAfterSale([FromBody] FMStringId entity) + public async Task GetDoHaveAfterSale([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -745,7 +745,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = "存在未处理的售后"; - return Json(jm); + return jm; } #endregion @@ -759,7 +759,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("完成订单")] - public async Task DoComplete([FromBody] FMStringId entity) + public async Task DoComplete([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -769,7 +769,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = result.data; jm.otherData = result.otherData; - return Json(jm); + return jm; } #endregion @@ -783,7 +783,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMStringId entity) + public async Task GetDetails([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -791,12 +791,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (result == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = result.status ? 0 : 1; jm.data = result.data; - return Json(jm); + return jm; } #endregion @@ -809,7 +809,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("订单打印")] - public async Task GetPrintTpl([FromBody] FMStringId entity) + public async Task GetPrintTpl([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -817,7 +817,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (result == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = result.status ? 0 : 1; @@ -834,7 +834,7 @@ namespace CoreCms.Net.Web.Admin.Controllers shopMobile }; - return Json(jm); + return jm; } #endregion @@ -847,14 +847,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayStringIds entity) + public async Task SelectExportExcel([FromBody] FMArrayStringIds entity) { var jm = new AdminUiCallBack(); if (entity.id.Length == 0) { jm.msg = "请选择要导出的数据"; - return Json(jm); + return jm; } @@ -1089,7 +1089,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -1101,7 +1101,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -1494,7 +1494,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -1507,7 +1507,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否开发票")] - public async Task DoSettaxType([FromBody] FMUpdateIntegerDataByIntId entity) + public async Task DoSettaxType([FromBody] FMUpdateIntegerDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -1515,7 +1515,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.taxType = entity.data; @@ -1523,7 +1523,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -1536,7 +1536,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否评论")] - public async Task DoSetisComment([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisComment([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -1544,7 +1544,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isComment = (bool)entity.data; @@ -1552,7 +1552,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -1565,7 +1565,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("更新备注")] - public async Task DoUpdateMark([FromBody] FMStringId entity) + public async Task DoUpdateMark([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -1573,14 +1573,14 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.mark = entity.data.ToString(); var bl = await _coreCmsOrderServices.UpdateAsync(p => new CoreCmsOrder() { mark = oldModel.mark }, p => p.orderId == oldModel.orderId); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -1593,21 +1593,21 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("取消订单")] - public async Task CancelOrder([FromBody] FMArrayStringIds entity) + public async Task CancelOrder([FromBody] FMArrayStringIds entity) { var jm = new AdminUiCallBack(); if (entity.id.Length == 0) { jm.msg = "请提交要取消的订单号"; - return Json(jm); + return jm; } var result = await _coreCmsOrderServices.CancelOrder(entity.id); jm.code = result.status ? 0 : 1; jm.msg = result.msg; - return Json(jm); + return jm; } #endregion @@ -1621,21 +1621,21 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除订单")] - public async Task DeleteOrder([FromBody] FMArrayStringIds entity) + public async Task DeleteOrder([FromBody] FMArrayStringIds entity) { var jm = new AdminUiCallBack(); if (entity.id.Length == 0) { jm.msg = "请提交要批量删除的订单号"; - return Json(jm); + return jm; } var result = await _coreCmsOrderServices.UpdateAsync(p => new CoreCmsOrder() { isdel = true }, p => entity.id.Contains(p.orderId)); jm.code = result ? 0 : 1; jm.msg = result ? "删除成功" : "删除失败"; - return Json(jm); + return jm; } #endregion @@ -1648,27 +1648,27 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除订单")] - public async Task RefreshDelivery([FromBody] FMStringId entity) + public async Task RefreshDelivery([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); if (string.IsNullOrEmpty(entity.id)) { jm.msg = "请提交要取消的订单号"; - return Json(jm); + return jm; } var delivery = await _billDeliveryServices.QueryByClauseAsync(p => p.deliveryId == entity.id); if (delivery == null) { jm.msg = "发货单获取失败"; - return Json(jm); + return jm; } jm.code = 0; jm.msg = "提交任务成功,请核实远端状态"; - return Json(jm); + return jm; } #endregion @@ -1682,7 +1682,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览快递进度")] - public async Task GetOrderLogistics([FromBody] FMStringId entity) + public async Task GetOrderLogistics([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -1690,12 +1690,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (result == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = result.status ? 0 : 1; jm.data = result.data; - return Json(jm); + return jm; } #endregion } diff --git a/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRecordController.cs b/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRecordController.cs index ce84eaf..4fc19c3 100644 --- a/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRecordController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRecordController.cs @@ -36,7 +36,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsPinTuanRecordController : Controller + public class CoreCmsPinTuanRecordController : ControllerBase { private readonly ICoreCmsPinTuanRecordServices _coreCmsPinTuanRecordServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -62,7 +62,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -212,7 +212,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -226,7 +226,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -236,7 +236,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { status }; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRuleController.cs b/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRuleController.cs index 2851367..911d95f 100644 --- a/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRuleController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRuleController.cs @@ -38,7 +38,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsPinTuanRuleController : Controller + public class CoreCmsPinTuanRuleController : ControllerBase { private readonly ICoreCmsGoodsServices _coreCmsGoodsServices; private readonly ICoreCmsPinTuanGoodsServices _coreCmsPinTuanGoodsServices; @@ -73,7 +73,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -171,7 +171,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -185,11 +185,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -203,11 +203,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -222,14 +222,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsPinTuanRule entity) + public async Task DoCreate([FromBody] CoreCmsPinTuanRule entity) { var jm = new AdminUiCallBack(); if (entity.peopleNumber < 2 || entity.peopleNumber > 10) { jm.msg = "拼团人数只允许2至10人"; - return Json(jm); + return jm; } entity.createTime = DateTime.Now; @@ -250,7 +250,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure; - return Json(jm); + return jm; } #endregion @@ -265,7 +265,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -273,7 +273,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -287,7 +287,7 @@ namespace CoreCms.Net.Web.Admin.Controllers goods }; - return Json(jm); + return jm; } #endregion @@ -302,21 +302,21 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsPinTuanRule entity) + public async Task DoEdit([FromBody] CoreCmsPinTuanRule entity) { var jm = new AdminUiCallBack(); if (entity.peopleNumber < 2 || entity.peopleNumber > 10) { jm.msg = "拼团人数只允许2至10人"; - return Json(jm); + return jm; } var oldModel = await _coreCmsPinTuanRuleServices.QueryByIdAsync(entity.id); if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -351,7 +351,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -366,7 +366,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -374,13 +374,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _coreCmsPinTuanRuleServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } @@ -396,7 +396,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否开启")] - public async Task DoSetisStatusOpen([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisStatusOpen([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -404,7 +404,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isStatusOpen = entity.data; @@ -413,7 +413,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Promotion/CoreCmsPromotionController.cs b/CoreCms.Net.Web.Admin/Controllers/Promotion/CoreCmsPromotionController.cs index 03f83a0..dc09afc 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Promotion/CoreCmsPromotionController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Promotion/CoreCmsPromotionController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsPromotionController : Controller + public class CoreCmsPromotionController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsPromotionServices _coreCmsPromotionServices; @@ -90,7 +90,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -252,7 +252,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -264,7 +264,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -273,7 +273,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { promotionType }; - return Json(jm); + return jm; } #endregion @@ -285,11 +285,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -302,21 +302,21 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsPromotion entity) + public async Task DoCreate([FromBody] CoreCmsPromotion entity) { var jm = new AdminUiCallBack(); if (entity.startTime >= entity.endTime) { jm.msg = "开始时间必须小于结束时间"; - return Json(jm); + return jm; } var bl = await _coreCmsPromotionServices.InsertAsync(entity) > 0; jm.code = bl ? 0 : 1; jm.msg = (bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure); - return Json(jm); + return jm; } #endregion @@ -329,7 +329,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -337,7 +337,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -359,7 +359,7 @@ namespace CoreCms.Net.Web.Admin.Controllers promotionResultTypes }; - return Json(jm); + return jm; } #endregion @@ -372,21 +372,21 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsPromotion entity) + public async Task DoEdit([FromBody] CoreCmsPromotion entity) { var jm = new AdminUiCallBack(); if (entity.startTime >= entity.endTime) { jm.msg = "开始时间必须小于结束时间"; - return Json(jm); + return jm; } var oldModel = await _coreCmsPromotionServices.QueryByIdAsync(entity.id); if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 oldModel.name = entity.name; @@ -415,7 +415,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel.effectiveDays == 0 && oldModel.effectiveHours == 0) { jm.msg = "优惠券有效时间不能为0"; - return Json(jm); + return jm; } } @@ -436,7 +436,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -449,7 +449,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -457,13 +457,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } model.isDel = true; var bl = await _coreCmsPromotionServices.UpdateAsync(model); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -478,7 +478,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否排他")] - public async Task DoSetisExclusive([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisExclusive([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -486,7 +486,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isExclusive = (bool)entity.data; @@ -494,7 +494,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -507,7 +507,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否开启")] - public async Task DoSetisEnable([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisEnable([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -515,7 +515,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isEnable = (bool)entity.data; @@ -523,7 +523,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -537,7 +537,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("添加促销条件")] - public async Task GetConditionCreate([FromBody] FMIntId entity) + public async Task GetConditionCreate([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -545,7 +545,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } //返回数据 jm.code = 0; @@ -567,7 +567,7 @@ namespace CoreCms.Net.Web.Admin.Controllers brands, grades }; - return Json(jm); + return jm; } @@ -584,7 +584,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("添加促销条件提交")] - public async Task DoConditionCreate([FromBody] CoreCmsPromotionCondition entity) + public async Task DoConditionCreate([FromBody] CoreCmsPromotionCondition entity) { var jm = new AdminUiCallBack(); @@ -592,7 +592,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = (bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure); - return Json(jm); + return jm; } #endregion @@ -604,7 +604,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取促销条件")] - public async Task GetConditionList() + public async Task GetConditionList() { var jm = new AdminUiCallBack(); var where = PredicateBuilder.True(); @@ -622,7 +622,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = list; jm.code = 0; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -635,7 +635,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("删除促销条件")] - public async Task DoConditionDelete([FromBody] FMIntId entity) + public async Task DoConditionDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -643,12 +643,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _coreCmsPromotionConditionServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -662,7 +662,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑促销数据")] - public async Task GetConditionEdit([FromBody] FMIntId entity) + public async Task GetConditionEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -670,7 +670,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -692,7 +692,7 @@ namespace CoreCms.Net.Web.Admin.Controllers grades }; - return Json(jm); + return jm; } #endregion @@ -705,7 +705,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑促销提交")] - public async Task DoConditionEdit([FromBody] CoreCmsPromotionCondition entity) + public async Task DoConditionEdit([FromBody] CoreCmsPromotionCondition entity) { var jm = new AdminUiCallBack(); @@ -713,7 +713,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 //oldModel.id = entity.id; @@ -726,7 +726,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -740,7 +740,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取促销结果列表")] - public async Task GetResultList() + public async Task GetResultList() { var jm = new AdminUiCallBack(); var where = PredicateBuilder.True(); @@ -758,7 +758,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = list; jm.code = 0; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -770,7 +770,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("添加促销结果")] - public async Task GetResultCreate([FromBody] FMIntId entity) + public async Task GetResultCreate([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -778,14 +778,14 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var resultCount = await _coreCmsPromotionResultServices.GetCountAsync(p => p.promotionId == entity.id); if (resultCount >= 1) { jm.msg = GlobalErrorCodeVars.Code15016; - return Json(jm); + return jm; } //返回数据 @@ -796,7 +796,7 @@ namespace CoreCms.Net.Web.Admin.Controllers resultCodes, promotionModel = model }; - return Json(jm); + return jm; } #endregion @@ -810,7 +810,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建促销结果提交")] - public async Task DoResultCreate([FromBody] CoreCmsPromotionResult entity) + public async Task DoResultCreate([FromBody] CoreCmsPromotionResult entity) { var jm = new AdminUiCallBack(); @@ -818,14 +818,14 @@ namespace CoreCms.Net.Web.Admin.Controllers if (resultCount >= 1) { jm.msg = GlobalErrorCodeVars.Code15016; - return Json(jm); + return jm; } var bl = await _coreCmsPromotionResultServices.InsertAsync(entity) > 0; jm.code = bl ? 0 : 1; jm.msg = (bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure); - return Json(jm); + return jm; } #endregion @@ -838,7 +838,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑促销结果")] - public async Task GetResultEdit([FromBody] FMIntId entity) + public async Task GetResultEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -846,7 +846,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; var resultCodes = SystemSettingDictionary.GetPromotionResultType(); @@ -856,7 +856,7 @@ namespace CoreCms.Net.Web.Admin.Controllers promotionModel = model }; - return Json(jm); + return jm; } #endregion @@ -869,7 +869,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑促销结果提交")] - public async Task DoResultEdit([FromBody] CoreCmsPromotionResult entity) + public async Task DoResultEdit([FromBody] CoreCmsPromotionResult entity) { var jm = new AdminUiCallBack(); @@ -877,7 +877,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 //oldModel.id = entity.id; @@ -890,7 +890,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -903,7 +903,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选促销结果删除")] - public async Task DoResultDelete([FromBody] FMIntId entity) + public async Task DoResultDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -911,12 +911,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _coreCmsPromotionResultServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -931,7 +931,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取优惠券码列表")] - public async Task GetCouponPageList() + public async Task GetCouponPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -1053,7 +1053,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -1065,11 +1065,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("优惠券码首页数据")] - public JsonResult GetCouponIndex() + public AdminUiCallBack GetCouponIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -1082,7 +1082,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否使用")] - public async Task DoSetCouponisUsed([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetCouponisUsed([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -1090,7 +1090,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isUsed = (bool)entity.data; @@ -1098,7 +1098,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -1111,7 +1111,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectCouponExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectCouponExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -1225,7 +1225,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -1237,7 +1237,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryCouponExportExcel() + public async Task QueryCouponExportExcel() { var jm = new AdminUiCallBack(); @@ -1425,7 +1425,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Reports/CoreCmsReportsController.cs b/CoreCms.Net.Web.Admin/Controllers/Reports/CoreCmsReportsController.cs index 4ca9ce9..6c97be9 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Reports/CoreCmsReportsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Reports/CoreCmsReportsController.cs @@ -37,7 +37,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsReportsController : Controller + public class CoreCmsReportsController : ControllerBase { private readonly ICoreCmsReportsServices _reportsServices; @@ -58,7 +58,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content /// [HttpPost] [Description("订单销量统计")] - public JsonResult GetOrder([FromBody] FMReports entity) + public AdminUiCallBack GetOrder([FromBody] FMReports entity) { var jm = new AdminUiCallBack(); @@ -66,7 +66,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content if (!dataRes.status) { jm.msg = dataRes.msg; - return Json(jm); + return jm; } var echartsOption = new EchartsOption(); @@ -81,7 +81,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content if (!xData.status) { jm.msg = dataRes.msg; - return Json(jm); + return jm; } echartsOption.xAxis.data = xData.data as List; @@ -161,7 +161,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content table = tableData }; - return Json(jm); + return jm; } #endregion @@ -174,7 +174,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content /// [HttpPost] [Description("财务收款单")] - public JsonResult GetPayments([FromBody] FMReports entity) + public AdminUiCallBack GetPayments([FromBody] FMReports entity) { var jm = new AdminUiCallBack(); @@ -182,7 +182,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content if (!dataRes.status) { jm.msg = dataRes.msg; - return Json(jm); + return jm; } var echartsOption = new EchartsOption(); @@ -197,7 +197,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content if (!xData.status) { jm.msg = dataRes.msg; - return Json(jm); + return jm; } echartsOption.xAxis.data = xData.data as List; @@ -308,7 +308,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content table = tableData }; - return Json(jm); + return jm; } #endregion @@ -321,7 +321,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content /// [HttpPost] [Description("商品销量统计")] - public async Task GetGoods() + public async Task GetGoods() { var jm = new AdminUiCallBack(); @@ -358,7 +358,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content else { jm.msg = "时间段格式不正确"; - return Json(jm); + return jm; } } else @@ -373,7 +373,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content jm.data = list; jm.count = list.TotalCount; - return Json(jm); + return jm; } #endregion @@ -386,7 +386,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content /// [HttpPost] [Description("商品收藏统计")] - public async Task GetGoodsCollection() + public async Task GetGoodsCollection() { var jm = new AdminUiCallBack(); @@ -415,7 +415,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content else { jm.msg = "时间段格式不正确"; - return Json(jm); + return jm; } } else @@ -430,7 +430,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content jm.data = list; jm.count = list.TotalCount; - return Json(jm); + return jm; } #endregion @@ -445,14 +445,14 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content /// [HttpPost] [Description("换算前台时间按钮")] - public JsonResult GetDateType([FromBody] FMIntId entity) + public AdminUiCallBack GetDateType([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); if (entity.id <= 0) { jm.msg = "请选择合法的时间段"; - return Json(jm); + return jm; } DateTime dt = DateTime.Now; //当前时间 @@ -529,7 +529,7 @@ namespace CoreCms.Net.Web.Admin.Controllers.Content start, end }; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsServicesController.cs b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsServicesController.cs index 7b3974a..0566835 100644 --- a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsServicesController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsServicesController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsServicesController : Controller + public class CoreCmsServicesController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsServicesServices _coreCmsServicesServices; @@ -69,7 +69,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -326,7 +326,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -338,7 +338,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public async Task GetIndex() + public async Task GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -355,7 +355,7 @@ namespace CoreCms.Net.Web.Admin.Controllers userGrade }; - return Json(jm); + return jm; } #endregion @@ -367,7 +367,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public async Task GetCreate() + public async Task GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -387,7 +387,7 @@ namespace CoreCms.Net.Web.Admin.Controllers stores }; - return Json(jm); + return jm; } #endregion @@ -400,19 +400,19 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsServices entity) + public async Task DoCreate([FromBody] CoreCmsServices entity) { var jm = new AdminUiCallBack(); if (string.IsNullOrEmpty(entity.consumableStore)) { jm.msg = "请选择审核门店"; - return Json(jm); + return jm; } if (string.IsNullOrEmpty(entity.allowedMembership)) { jm.msg = "请选择会员级别"; - return Json(jm); + return jm; } entity.createTime = DateTime.Now; @@ -428,7 +428,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = (bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure); - return Json(jm); + return jm; } #endregion @@ -441,7 +441,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -449,7 +449,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } model.consumableStore = CommonHelper.GetCaptureInterceptedText(model.consumableStore, ","); model.allowedMembership = CommonHelper.GetCaptureInterceptedText(model.allowedMembership, ","); @@ -473,7 +473,7 @@ namespace CoreCms.Net.Web.Admin.Controllers stores }; - return Json(jm); + return jm; } #endregion @@ -486,21 +486,21 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsServices entity) + public async Task DoEdit([FromBody] CoreCmsServices entity) { var jm = new AdminUiCallBack(); if (string.IsNullOrEmpty(entity.consumableStore)) { jm.msg = "请选择审核门店"; - return Json(jm); + return jm; } var oldModel = await _coreCmsServicesServices.QueryByIdAsync(entity.id); if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 //oldModel.id = entity.id; @@ -532,7 +532,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -545,7 +545,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -553,14 +553,14 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var haveOrder = await _userServicesOrderServices.ExistsAsync(p => p.servicesId == model.id); if (haveOrder) { jm.msg = "存在关联订单,禁止删除"; - return Json(jm); + return jm; } @@ -568,7 +568,7 @@ namespace CoreCms.Net.Web.Admin.Controllers var bl = await _coreCmsServicesServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -582,7 +582,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -590,12 +590,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -608,7 +608,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -802,7 +802,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -814,7 +814,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -1155,7 +1155,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs index d62f072..94a4e44 100644 --- a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsUserServicesOrderController : Controller + public class CoreCmsUserServicesOrderController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsUserServicesOrderServices _CoreCmsUserServicesOrderServices; @@ -65,7 +65,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -237,7 +237,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion 获取列表============================================================ @@ -251,11 +251,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion 首页数据============================================================ @@ -269,11 +269,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion 创建数据============================================================ @@ -288,7 +288,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsUserServicesOrder entity) + public async Task DoCreate([FromBody] CoreCmsUserServicesOrder entity) { var jm = new AdminUiCallBack(); @@ -296,7 +296,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = (bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure); - return Json(jm); + return jm; } #endregion 创建提交============================================================ @@ -311,7 +311,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -319,12 +319,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion 编辑数据============================================================ @@ -339,7 +339,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsUserServicesOrder entity) + public async Task DoEdit([FromBody] CoreCmsUserServicesOrder entity) { var jm = new AdminUiCallBack(); @@ -347,7 +347,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 oldModel.id = entity.id; @@ -366,7 +366,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion 编辑提交============================================================ @@ -381,7 +381,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -389,12 +389,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _CoreCmsUserServicesOrderServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion 删除数据============================================================ @@ -409,7 +409,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除")] - public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) + public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -417,7 +417,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion 批量删除============================================================ @@ -432,7 +432,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -440,12 +440,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion 预览数据============================================================ @@ -460,7 +460,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -590,7 +590,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion 选择导出============================================================ @@ -604,7 +604,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -805,7 +805,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion 查询导出============================================================ @@ -820,7 +820,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否支付")] - public async Task DoSetisPay([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisPay([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -828,7 +828,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isPay = (bool)entity.data; @@ -836,7 +836,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion 设置是否支付============================================================ diff --git a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesTicketController.cs b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesTicketController.cs index 9a81dc3..c72eec5 100644 --- a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesTicketController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesTicketController.cs @@ -39,7 +39,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsUserServicesTicketController : Controller + public class CoreCmsUserServicesTicketController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsUserServicesTicketServices _CoreCmsUserServicesTicketServices; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -272,7 +272,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion 获取列表============================================================ @@ -286,11 +286,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion 首页数据============================================================ @@ -304,11 +304,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion 创建数据============================================================ @@ -323,7 +323,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsUserServicesTicket entity) + public async Task DoCreate([FromBody] CoreCmsUserServicesTicket entity) { var jm = new AdminUiCallBack(); @@ -331,7 +331,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = (bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure); - return Json(jm); + return jm; } #endregion 创建提交============================================================ @@ -346,7 +346,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -354,12 +354,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion 编辑数据============================================================ @@ -374,7 +374,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsUserServicesTicket entity) + public async Task DoEdit([FromBody] CoreCmsUserServicesTicket entity) { var jm = new AdminUiCallBack(); @@ -382,7 +382,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 oldModel.serviceOrderId = entity.serviceOrderId; @@ -403,7 +403,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion 编辑提交============================================================ @@ -418,7 +418,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -426,12 +426,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _CoreCmsUserServicesTicketServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion 删除数据============================================================ @@ -446,7 +446,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除")] - public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) + public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -454,7 +454,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion 批量删除============================================================ @@ -469,7 +469,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -477,12 +477,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion 预览数据============================================================ @@ -497,7 +497,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -654,7 +654,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion 选择导出============================================================ @@ -668,7 +668,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -909,7 +909,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion 查询导出============================================================ @@ -924,7 +924,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否核销")] - public async Task DoSetisVerification([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisVerification([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -932,7 +932,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isVerification = (bool)entity.data; @@ -940,7 +940,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion 设置是否核销============================================================ diff --git a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesTicketVerificationLogController.cs b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesTicketVerificationLogController.cs index 36fb5f1..95b80ed 100644 --- a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesTicketVerificationLogController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesTicketVerificationLogController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsUserServicesTicketVerificationLogController : Controller + public class CoreCmsUserServicesTicketVerificationLogController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsUserServicesTicketVerificationLogServices _CoreCmsUserServicesTicketVerificationLogServices; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -162,7 +162,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -174,11 +174,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -190,11 +190,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -207,7 +207,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsUserServicesTicketVerificationLog entity) + public async Task DoCreate([FromBody] CoreCmsUserServicesTicketVerificationLog entity) { var jm = new AdminUiCallBack(); @@ -215,7 +215,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = (bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure); - return Json(jm); + return jm; } #endregion @@ -228,7 +228,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -236,12 +236,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -254,7 +254,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsUserServicesTicketVerificationLog entity) + public async Task DoEdit([FromBody] CoreCmsUserServicesTicketVerificationLog entity) { var jm = new AdminUiCallBack(); @@ -262,7 +262,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 oldModel.id = entity.id; @@ -277,7 +277,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -290,7 +290,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -298,12 +298,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _CoreCmsUserServicesTicketVerificationLogServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -317,7 +317,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除")] - public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) + public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -325,7 +325,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -339,7 +339,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -347,12 +347,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -365,7 +365,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -460,7 +460,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -472,7 +472,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -621,7 +621,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsAreaController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsAreaController.cs index da65fcb..cd60a91 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsAreaController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsAreaController.cs @@ -39,7 +39,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsAreaController : Controller + public class CoreCmsAreaController : ControllerBase { private readonly ICoreCmsAreaServices _coreCmsAreaServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetAllList() + public async Task GetAllList() { var jm = new AdminUiCallBack(); @@ -74,7 +74,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = list; jm.code = 0; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -89,7 +89,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -158,7 +158,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -172,11 +172,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -190,7 +190,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public async Task GetCreate([FromBody] FMIntId entity) + public async Task GetCreate([FromBody] FMIntId entity) { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -198,7 +198,7 @@ namespace CoreCms.Net.Web.Admin.Controllers var parentModel = await _coreCmsAreaServices.QueryByClauseAsync(p => p.id == entity.id); jm.data = parentModel; - return Json(jm); + return jm; } #endregion @@ -213,10 +213,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsArea entity) + public async Task DoCreate([FromBody] CoreCmsArea entity) { var jm = await _coreCmsAreaServices.InsertAsync(entity); - return Json(jm); + return jm; } #endregion @@ -231,7 +231,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -239,14 +239,14 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -261,10 +261,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsArea entity) + public async Task DoEdit([FromBody] CoreCmsArea entity) { var jm = await _coreCmsAreaServices.UpdateAsync(entity); - return Json(jm); + return jm; } #endregion @@ -279,7 +279,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -287,11 +287,11 @@ namespace CoreCms.Net.Web.Admin.Controllers if (bl) { jm.msg = GlobalConstVars.DeleteIsHaveChildren; - return Json(jm); + return jm; } jm = await _coreCmsAreaServices.DeleteByIdAsync(entity.id); - return Json(jm); + return jm; } diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsLogisticsController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsLogisticsController.cs index 48a7bad..d623c42 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsLogisticsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsLogisticsController.cs @@ -37,7 +37,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsLogisticsController : Controller + public class CoreCmsLogisticsController : ControllerBase { private readonly ICoreCmsLogisticsServices _coreCmsLogisticsServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -63,7 +63,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -129,7 +129,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -143,11 +143,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -162,7 +162,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否删除")] - public async Task DoSetisDelete([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisDelete([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -170,7 +170,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isDelete = entity.data; @@ -180,7 +180,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -193,10 +193,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoUpdateCompany() + public async Task DoUpdateCompany() { var jm = await _coreCmsLogisticsServices.DoUpdateCompany(); - return Json(jm); + return jm; } diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsNoticeController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsNoticeController.cs index 6c1ce99..7fd2240 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsNoticeController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsNoticeController.cs @@ -37,7 +37,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsNoticeController : Controller + public class CoreCmsNoticeController : ControllerBase { private readonly ICoreCmsNoticeServices _coreCmsNoticeServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -63,7 +63,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -157,7 +157,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -171,11 +171,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -189,11 +189,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -208,7 +208,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsNotice entity) + public async Task DoCreate([FromBody] CoreCmsNotice entity) { var jm = new AdminUiCallBack(); @@ -219,7 +219,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure; - return Json(jm); + return jm; } #endregion @@ -234,7 +234,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -242,13 +242,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -263,7 +263,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsNotice entity) + public async Task DoEdit([FromBody] CoreCmsNotice entity) { var jm = new AdminUiCallBack(); @@ -271,7 +271,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -289,7 +289,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -304,7 +304,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -312,13 +312,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _coreCmsNoticeServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } @@ -334,7 +334,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除")] - public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) + public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -343,7 +343,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -358,7 +358,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置软删除位 有时间代表已删除")] - public async Task DoSetisDel([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisDel([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -366,7 +366,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isDel = entity.data; @@ -375,7 +375,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesController.cs index f1bcff6..dcfd842 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsPagesController : Controller + public class CoreCmsPagesController : ControllerBase { private readonly ICoreCmsArticleTypeServices _articleTypeServices; private readonly ICoreCmsBrandServices _brandServices; @@ -87,7 +87,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -156,7 +156,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -170,11 +170,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -188,7 +188,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -198,7 +198,7 @@ namespace CoreCms.Net.Web.Admin.Controllers pagesLayout, }; - return Json(jm); + return jm; } #endregion @@ -213,10 +213,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsPages entity) + public async Task DoCreate([FromBody] CoreCmsPages entity) { var jm = await _coreCmsPagesServices.InsertAsync(entity); - return Json(jm); + return jm; } #endregion @@ -230,7 +230,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -238,7 +238,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -250,7 +250,7 @@ namespace CoreCms.Net.Web.Admin.Controllers pagesLayout, }; - return Json(jm); + return jm; } #endregion @@ -263,11 +263,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsPages entity) + public async Task DoEdit([FromBody] CoreCmsPages entity) { var jm = await _coreCmsPagesServices.UpdateAsync(entity); - return Json(jm); + return jm; } #endregion @@ -281,10 +281,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = await _coreCmsPagesServices.DeleteByIdAsync(entity.id); - return Json(jm); + return jm; } @@ -300,10 +300,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("复制数据")] - public async Task DoCopy([FromBody] FMIntId entity) + public async Task DoCopy([FromBody] FMIntId entity) { var jm = await _coreCmsPagesServices.CopyByIdAsync(entity.id); - return Json(jm); + return jm; } @@ -320,7 +320,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("版面设计")] - public async Task GetDesign([FromBody] FMIntId entity) + public async Task GetDesign([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -328,7 +328,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -350,7 +350,7 @@ namespace CoreCms.Net.Web.Admin.Controllers articleTypes }; - return Json(jm); + return jm; } #endregion @@ -365,10 +365,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("版面设计提交")] - public async Task DoDesign([FromBody] FmPagesUpdate entity) + public async Task DoDesign([FromBody] FmPagesUpdate entity) { var jm = await _coreCmsPagesServices.UpdateDesignAsync(entity); - return Json(jm); + return jm; } #endregion @@ -383,7 +383,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取已存储数据")] - public async Task GetPageData([FromBody] FMIntId entity) + public async Task GetPageData([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -391,7 +391,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -410,7 +410,7 @@ namespace CoreCms.Net.Web.Admin.Controllers pageConfig }; - return Json(jm); + return jm; } #endregion @@ -424,7 +424,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取文章类别")] - public async Task GetArticleTypes([FromBody] FMIntId entity) + public async Task GetArticleTypes([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -432,7 +432,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -443,7 +443,7 @@ namespace CoreCms.Net.Web.Admin.Controllers articleTypes }; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesItemsController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesItemsController.cs index 2f2370e..165d28b 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesItemsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesItemsController.cs @@ -39,7 +39,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsPagesItemsController : Controller + public class CoreCmsPagesItemsController : ControllerBase { private readonly ICoreCmsPagesItemsServices _coreCmsPagesItemsServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -66,7 +66,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -135,7 +135,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -149,11 +149,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -167,11 +167,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -186,7 +186,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsPagesItems entity) + public async Task DoCreate([FromBody] CoreCmsPagesItems entity) { var jm = new AdminUiCallBack(); @@ -194,7 +194,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure; - return Json(jm); + return jm; } #endregion @@ -209,7 +209,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -217,13 +217,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -238,7 +238,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsPagesItems entity) + public async Task DoEdit([FromBody] CoreCmsPagesItems entity) { var jm = new AdminUiCallBack(); @@ -246,7 +246,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -261,7 +261,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -276,7 +276,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -284,13 +284,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _coreCmsPagesItemsServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } @@ -306,7 +306,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除")] - public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) + public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -314,7 +314,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -329,7 +329,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -337,13 +337,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -358,7 +358,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -406,7 +406,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -420,7 +420,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -489,7 +489,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsServiceDescriptionController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsServiceDescriptionController.cs index 07d2a57..723a7be 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsServiceDescriptionController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsServiceDescriptionController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsServiceDescriptionController : Controller + public class CoreCmsServiceDescriptionController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsServiceDescriptionServices _coreCmsServiceDescriptionServices; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -141,7 +141,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -153,7 +153,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -165,7 +165,7 @@ namespace CoreCms.Net.Web.Admin.Controllers serviceNoteType }; - return Json(jm); + return jm; } #endregion @@ -177,7 +177,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -189,7 +189,7 @@ namespace CoreCms.Net.Web.Admin.Controllers serviceNoteType }; - return Json(jm); + return jm; } #endregion @@ -202,10 +202,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsServiceDescription entity) + public async Task DoCreate([FromBody] CoreCmsServiceDescription entity) { var jm = await _coreCmsServiceDescriptionServices.InsertAsync(entity); - return Json(jm); + return jm; } #endregion @@ -218,7 +218,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -226,7 +226,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -238,7 +238,7 @@ namespace CoreCms.Net.Web.Admin.Controllers serviceNoteType }; - return Json(jm); + return jm; } #endregion @@ -251,10 +251,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsServiceDescription entity) + public async Task DoEdit([FromBody] CoreCmsServiceDescription entity) { var jm = await _coreCmsServiceDescriptionServices.UpdateAsync(entity); - return Json(jm); + return jm; } #endregion @@ -267,7 +267,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -275,11 +275,11 @@ namespace CoreCms.Net.Web.Admin.Controllers if (!model) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } jm = await _coreCmsServiceDescriptionServices.DeleteByIdAsync(entity.id); - return Json(jm); + return jm; } #endregion @@ -292,7 +292,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -300,7 +300,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -313,7 +313,7 @@ namespace CoreCms.Net.Web.Admin.Controllers }; - return Json(jm); + return jm; } #endregion @@ -326,7 +326,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否展示")] - public async Task DoSetisShow([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisShow([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -334,13 +334,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isShow = (bool)entity.data; jm = await _coreCmsServiceDescriptionServices.UpdateAsync(oldModel); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsSettingController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsSettingController.cs index 9c9dc00..ed9c39a 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsSettingController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsSettingController.cs @@ -38,7 +38,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsSettingController : Controller + public class CoreCmsSettingController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsSettingServices _coreCmsSettingServices; @@ -62,7 +62,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public async Task GetIndex() + public async Task GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -75,7 +75,7 @@ namespace CoreCms.Net.Web.Admin.Controllers filesStorageOptionsType }; - return Json(jm); + return jm; } #endregion @@ -88,10 +88,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("保存提交")] - public async Task DoSave([FromBody] FMCoreCmsSettingDoSaveModel model) + public async Task DoSave([FromBody] FMCoreCmsSettingDoSaveModel model) { var jm = await _coreCmsSettingServices.UpdateAsync(model); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsShipController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsShipController.cs index cf47d17..8eb1a87 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsShipController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsShipController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsShipController : Controller + public class CoreCmsShipController : ControllerBase { private readonly ICoreCmsShipServices _coreCmsShipServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -69,7 +69,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -213,7 +213,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -227,11 +227,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -245,7 +245,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public async Task GetCreate() + public async Task GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -257,7 +257,7 @@ namespace CoreCms.Net.Web.Admin.Controllers shipUnit, logistics, }; - return Json(jm); + return jm; } #endregion @@ -272,10 +272,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsShip entity) + public async Task DoCreate([FromBody] CoreCmsShip entity) { var jm = await _coreCmsShipServices.InsertAsync(entity); - return Json(jm); + return jm; } #endregion @@ -290,7 +290,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -298,7 +298,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -315,7 +315,7 @@ namespace CoreCms.Net.Web.Admin.Controllers logistics, model }; - return Json(jm); + return jm; } #endregion @@ -330,10 +330,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsShip entity) + public async Task DoEdit([FromBody] CoreCmsShip entity) { var jm = await _coreCmsShipServices.UpdateAsync(entity); - return Json(jm); + return jm; } #endregion @@ -348,7 +348,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -356,11 +356,11 @@ namespace CoreCms.Net.Web.Admin.Controllers if (!model) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } jm = await _coreCmsShipServices.DeleteByIdAsync(entity.id); - return Json(jm); + return jm; } @@ -376,7 +376,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否货到付款")] - public async Task DoSetisCashOnDelivery([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisCashOnDelivery([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -384,13 +384,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isCashOnDelivery = (bool)entity.data; jm = await _coreCmsShipServices.UpdateAsync(oldModel); - return Json(jm); + return jm; } #endregion @@ -405,7 +405,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否按地区设置配送费用")] - public async Task DoSetisdefaultAreaFee([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisdefaultAreaFee([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -413,13 +413,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isdefaultAreaFee = (bool)entity.data; jm = await _coreCmsShipServices.UpdateAsync(oldModel); - return Json(jm); + return jm; } #endregion @@ -434,7 +434,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否默认")] - public async Task DoSetisDefault([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisDefault([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -442,13 +442,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isDefault = (bool)entity.data; jm = await _coreCmsShipServices.UpdateAsync(oldModel); - return Json(jm); + return jm; } #endregion @@ -463,7 +463,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否包邮")] - public async Task DoSetisfreePostage([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisfreePostage([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -471,13 +471,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isfreePostage = (bool)entity.data; jm = await _coreCmsShipServices.UpdateAsync(oldModel); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsStoreController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsStoreController.cs index a329bc2..9e492e9 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsStoreController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsStoreController.cs @@ -37,7 +37,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsStoreController : Controller + public class CoreCmsStoreController : ControllerBase { private readonly ICoreCmsClerkServices _coreCmsClerkServices; private readonly ICoreCmsStoreServices _coreCmsStoreServices; @@ -66,7 +66,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -203,7 +203,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -217,11 +217,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -235,11 +235,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -254,14 +254,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsStore entity) + public async Task DoCreate([FromBody] CoreCmsStore entity) { var jm = new AdminUiCallBack(); entity.createTime = DateTime.Now; jm = await _coreCmsStoreServices.InsertAsync(entity); - return Json(jm); + return jm; } #endregion @@ -276,7 +276,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -284,13 +284,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -305,14 +305,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsStore entity) + public async Task DoEdit([FromBody] CoreCmsStore entity) { var jm = new AdminUiCallBack(); entity.updateTime = DateTime.Now; jm = await _coreCmsStoreServices.UpdateAsync(entity); - return Json(jm); + return jm; } #endregion @@ -327,7 +327,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -335,7 +335,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _coreCmsStoreServices.DeleteByIdAsync(entity.id); @@ -346,7 +346,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } @@ -362,7 +362,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否默认")] - public async Task DoSetisDefault([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisDefault([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -370,7 +370,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isDefault = entity.data; @@ -378,7 +378,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm = await _coreCmsStoreServices.UpdateAsync(oldModel); - return Json(jm); + return jm; } #endregion @@ -394,7 +394,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetClerkPageList() + public async Task GetClerkPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -498,7 +498,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -512,11 +512,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("店员首页数据")] - public JsonResult GetClerkIndex() + public AdminUiCallBack GetClerkIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -530,11 +530,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建店员数据")] - public JsonResult GetClerkCreate() + public AdminUiCallBack GetClerkCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -549,27 +549,27 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建店员提交")] - public async Task DoClerkCreate([FromBody] FMStoreClerkCURDPost entity) + public async Task DoClerkCreate([FromBody] FMStoreClerkCURDPost entity) { var jm = new AdminUiCallBack(); if (string.IsNullOrEmpty(entity.phone)) { jm.msg = "请输入合法的手机号码"; - return Json(jm); + return jm; } if (entity.storeId == 0) { jm.msg = "请选择要添加的门店"; - return Json(jm); + return jm; } var haveStore = await _coreCmsStoreServices.ExistsAsync(p => p.id == entity.storeId); if (!haveStore) { jm.msg = "门店信息不存在"; - return Json(jm); + return jm; } //判断是否存在当前的门店内 @@ -577,7 +577,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (user == null) { jm.msg = "不存在此手机注册用户"; - return Json(jm); + return jm; } var haveClerk = @@ -585,7 +585,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (haveClerk) { jm.msg = "用户已经是当前门店店员"; - return Json(jm); + return jm; } var model = new CoreCmsClerk @@ -601,7 +601,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure; - return Json(jm); + return jm; } #endregion @@ -616,7 +616,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑店员数据")] - public async Task GetClerkEdit([FromBody] FMIntId entity) + public async Task GetClerkEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -624,13 +624,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -645,7 +645,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑店员提交")] - public async Task DoClerkEdit([FromBody] FMStoreClerkCURDPost entity) + public async Task DoClerkEdit([FromBody] FMStoreClerkCURDPost entity) { var jm = new AdminUiCallBack(); @@ -653,26 +653,26 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } if (string.IsNullOrEmpty(entity.phone)) { jm.msg = "请输入合法的手机号码"; - return Json(jm); + return jm; } if (entity.storeId == 0) { jm.msg = "请选择要编辑的门店"; - return Json(jm); + return jm; } var haveStore = await _coreCmsStoreServices.ExistsAsync(p => p.id == entity.storeId); if (!haveStore) { jm.msg = "门店信息不存在"; - return Json(jm); + return jm; } //判断是否存在当前的门店内 @@ -680,7 +680,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (user == null) { jm.msg = "不存在此手机注册用户"; - return Json(jm); + return jm; } var haveClerk = @@ -688,7 +688,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (haveClerk) { jm.msg = "用户已经是当前门店店员"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -700,7 +700,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -715,7 +715,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除店员")] - public async Task DoClerkDelete([FromBody] FMIntId entity) + public async Task DoClerkDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -723,13 +723,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _coreCmsClerkServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } @@ -746,7 +746,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除店员")] - public async Task DoClerkBatchDelete([FromBody] FMArrayIntIds entity) + public async Task DoClerkBatchDelete([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -754,7 +754,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Solitaire/CoreCmsSolitaireController.cs b/CoreCms.Net.Web.Admin/Controllers/Solitaire/CoreCmsSolitaireController.cs index d87235e..2bd2387 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Solitaire/CoreCmsSolitaireController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Solitaire/CoreCmsSolitaireController.cs @@ -41,7 +41,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsSolitaireController : Controller + public class CoreCmsSolitaireController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsSolitaireServices _solitaireServices; @@ -66,7 +66,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -206,7 +206,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -218,7 +218,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -227,7 +227,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { solitaireStatus }; - return Json(jm); + return jm; } #endregion @@ -239,7 +239,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -250,7 +250,7 @@ namespace CoreCms.Net.Web.Admin.Controllers solitaireStatus }; - return Json(jm); + return jm; } #endregion @@ -263,10 +263,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsSolitaire entity) + public async Task DoCreate([FromBody] CoreCmsSolitaire entity) { var jm = await _solitaireServices.InsertAsync(entity); - return Json(jm); + return jm; } #endregion @@ -279,7 +279,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -287,7 +287,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var items = await _itemsServices.QueryListByClauseAsync(p => p.solitaireId == model.id && p.isDelete == false, p => p.sortId, OrderByType.Asc); @@ -302,7 +302,7 @@ namespace CoreCms.Net.Web.Admin.Controllers }; jm.code = 0; - return Json(jm); + return jm; } #endregion @@ -315,11 +315,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsSolitaire entity) + public async Task DoEdit([FromBody] CoreCmsSolitaire entity) { var jm = await _solitaireServices.UpdateAsync(entity); jm.otherData = entity; - return Json(jm); + return jm; } #endregion @@ -335,7 +335,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -343,12 +343,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //jm = await _coreCmsSolitaireServices.DeleteByIdAsync(entity.id); var bl = await _solitaireServices.UpdateAsync(p => new CoreCmsSolitaire() { isDelete = true }, p => p.id == oldModel.id); - return Json(jm); + return jm; } #endregion @@ -361,7 +361,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否显示")] - public async Task DoSetisShow([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisShow([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -369,7 +369,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isShow = (bool)entity.data; @@ -377,7 +377,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -390,7 +390,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置标注删除")] - public async Task DoSetisDelete([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisDelete([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -398,7 +398,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isDelete = (bool)entity.data; @@ -406,7 +406,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Solitaire/CoreCmsSolitaireItemsController.cs b/CoreCms.Net.Web.Admin/Controllers/Solitaire/CoreCmsSolitaireItemsController.cs index 8d070ce..c38fef0 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Solitaire/CoreCmsSolitaireItemsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Solitaire/CoreCmsSolitaireItemsController.cs @@ -41,7 +41,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsSolitaireItemsController : Controller + public class CoreCmsSolitaireItemsController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsSolitaireItemsServices _CoreCmsSolitaireItemsServices; @@ -65,7 +65,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -150,7 +150,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -162,11 +162,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -178,11 +178,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -195,10 +195,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsSolitaireItems entity) + public async Task DoCreate([FromBody] CoreCmsSolitaireItems entity) { var jm = await _CoreCmsSolitaireItemsServices.InsertAsync(entity); - return Json(jm); + return jm; } #endregion @@ -211,7 +211,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -219,12 +219,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -237,10 +237,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsSolitaireItems entity) + public async Task DoEdit([FromBody] CoreCmsSolitaireItems entity) { var jm = await _CoreCmsSolitaireItemsServices.UpdateAsync(entity); - return Json(jm); + return jm; } #endregion @@ -253,7 +253,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -261,11 +261,11 @@ namespace CoreCms.Net.Web.Admin.Controllers if (!model) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } jm = await _CoreCmsSolitaireItemsServices.DeleteByIdAsync(entity.id); - return Json(jm); + return jm; } #endregion @@ -278,10 +278,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除")] - public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) + public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) { var jm = await _CoreCmsSolitaireItemsServices.DeleteByIdsAsync(entity.id); - return Json(jm); + return jm; } #endregion @@ -295,7 +295,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -303,12 +303,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -321,7 +321,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -434,7 +434,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -446,7 +446,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -626,7 +626,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -640,7 +640,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置标注删除")] - public async Task DoSetisDelete([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisDelete([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -648,7 +648,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isDelete = (bool)entity.data; @@ -656,7 +656,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockController.cs b/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockController.cs index 469b08b..dc43c35 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockController.cs @@ -41,7 +41,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsStockController : Controller + public class CoreCmsStockController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsStockServices _stockServices; @@ -72,7 +72,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -154,7 +154,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -166,7 +166,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -177,7 +177,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { stockType, }; - return Json(jm); + return jm; } #endregion @@ -189,7 +189,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public async Task GetCreate() + public async Task GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -204,7 +204,7 @@ namespace CoreCms.Net.Web.Admin.Controllers products, }; - return Json(jm); + return jm; } #endregion @@ -217,7 +217,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] FMCreateStock entity) + public async Task DoCreate([FromBody] FMCreateStock entity) { if (_user != null) { @@ -229,7 +229,7 @@ namespace CoreCms.Net.Web.Admin.Controllers } var jm = await _stockServices.InsertAsync(entity); - return Json(jm); + return jm; } #endregion @@ -242,7 +242,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMStringId entity) + public async Task GetDetails([FromBody] FMStringId entity) { var jm = new AdminUiCallBack(); @@ -250,7 +250,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var manager = await _sysUserServices.QueryByClauseAsync(p => p.id == model.manager); @@ -266,7 +266,7 @@ namespace CoreCms.Net.Web.Admin.Controllers manager }; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockLogController.cs b/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockLogController.cs index e8a3c78..76af970 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockLogController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockLogController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsStockLogController : Controller + public class CoreCmsStockLogController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsStockLogServices _coreCmsStockLogServices; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -184,7 +184,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -196,7 +196,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -207,7 +207,7 @@ namespace CoreCms.Net.Web.Admin.Controllers stockType }; - return Json(jm); + return jm; } #endregion @@ -219,11 +219,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/System/CodeGeneratorController.cs b/CoreCms.Net.Web.Admin/Controllers/System/CodeGeneratorController.cs index 16852c8..05b0b78 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/CodeGeneratorController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/CodeGeneratorController.cs @@ -35,7 +35,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [Route("api/[controller]/[action]")] [ApiController] //[Authorize(Permissions.Name)] - public class CodeGeneratorController : Controller + public class CodeGeneratorController : ControllerBase { private readonly ICodeGeneratorServices _codeGeneratorServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -59,7 +59,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取数据表格列表")] - public JsonResult GetTables() + public AdminUiCallBack GetTables() { var tables = _codeGeneratorServices.GetDbTables(); @@ -73,7 +73,7 @@ namespace CoreCms.Net.Web.Admin.Controllers data = _mapper .Map, List>(tables) }; - return Json(jm); + return jm; } /// @@ -90,12 +90,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (string.IsNullOrEmpty(tableName)) { jm.msg = "请选择数据库"; - return Json(jm); + return new JsonResult(jm); } if (string.IsNullOrEmpty(fileType)) { jm.msg = "请选择要导出的文件类型"; - return Json(jm); + return new JsonResult(jm); } if (tableName == "AllTable") @@ -108,7 +108,7 @@ namespace CoreCms.Net.Web.Admin.Controllers else { jm.msg = tableName + "获取数据库字段失败"; - return Json(jm); + return new JsonResult(jm); } } else @@ -121,7 +121,7 @@ namespace CoreCms.Net.Web.Admin.Controllers else { jm.msg = tableName + "获取数据库字段失败"; - return Json(jm); + return new JsonResult(jm); } } @@ -136,7 +136,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取所有表和表名并生成excel")] - public JsonResult GetDataBaseTablesToExcel() + public AdminUiCallBack GetDataBaseTablesToExcel() { var jm = new AdminUiCallBack(); @@ -198,7 +198,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysDictionaryController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysDictionaryController.cs index 4da37e8..d319b4c 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysDictionaryController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysDictionaryController.cs @@ -37,7 +37,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class SysDictionaryController : Controller + public class SysDictionaryController : ControllerBase { private readonly ISysDictionaryDataServices _sysDictionaryDataServices; private readonly ISysDictionaryServices _sysDictionaryServices; @@ -65,7 +65,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -181,7 +181,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -195,11 +195,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -213,11 +213,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -232,7 +232,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] SysDictionary entity) + public async Task DoCreate([FromBody] SysDictionary entity) { var jm = new AdminUiCallBack(); @@ -242,7 +242,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure; - return Json(jm); + return jm; } #endregion @@ -257,7 +257,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -265,13 +265,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -286,7 +286,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] SysDictionary entity) + public async Task DoEdit([FromBody] SysDictionary entity) { var jm = new AdminUiCallBack(); @@ -294,7 +294,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -309,7 +309,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -324,7 +324,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -332,19 +332,19 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } if (await _sysDictionaryDataServices.ExistsAsync(p => p.dictId == model.id)) { jm.msg = GlobalConstVars.DeleteIsHaveChildren; - return Json(jm); + return jm; } var bl = await _sysDictionaryServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysDictionaryDataController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysDictionaryDataController.cs index 938db5b..3e07fe1 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysDictionaryDataController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysDictionaryDataController.cs @@ -37,7 +37,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class SysDictionaryDataController : Controller + public class SysDictionaryDataController : ControllerBase { private readonly ISysDictionaryDataServices _sysDictionaryDataServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -62,7 +62,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -184,7 +184,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -198,11 +198,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -216,11 +216,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -235,7 +235,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] SysDictionaryData entity) + public async Task DoCreate([FromBody] SysDictionaryData entity) { var jm = new AdminUiCallBack(); @@ -245,7 +245,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure; - return Json(jm); + return jm; } #endregion @@ -260,7 +260,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -268,13 +268,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -289,7 +289,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] SysDictionaryData entity) + public async Task DoEdit([FromBody] SysDictionaryData entity) { var jm = new AdminUiCallBack(); @@ -297,7 +297,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -313,7 +313,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -328,7 +328,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -336,14 +336,14 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _sysDictionaryDataServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -358,7 +358,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除")] - public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) + public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -366,7 +366,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysLoginRecordController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysLoginRecordController.cs index 56b6e3c..3d59197 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysLoginRecordController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysLoginRecordController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class SysLoginRecordController : Controller + public class SysLoginRecordController : ControllerBase { private readonly ISysLoginRecordServices _sysLoginRecordServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -65,7 +65,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -190,7 +190,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -204,7 +204,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -215,7 +215,7 @@ namespace CoreCms.Net.Web.Admin.Controllers logType }; - return Json(jm); + return jm; } #endregion @@ -230,7 +230,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -238,13 +238,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -259,7 +259,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -314,7 +314,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -328,7 +328,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -426,7 +426,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -441,7 +441,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除")] - public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) + public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -449,7 +449,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -463,7 +463,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("清空数据")] - public async Task DoWipeData() + public async Task DoWipeData() { var jm = new AdminUiCallBack(); @@ -471,7 +471,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysMenuController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysMenuController.cs index d70882f..85630aa 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysMenuController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysMenuController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class SysMenuController : Controller + public class SysMenuController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ISysMenuServices _sysMenuServices; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var where = PredicateBuilder.True(); @@ -99,7 +99,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.Count; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -111,11 +111,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -127,12 +127,12 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -145,14 +145,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] SysMenu entity) + public async Task DoCreate([FromBody] SysMenu entity) { var jm = new AdminUiCallBack(); entity.createTime = DateTime.Now; ; jm = await _sysMenuServices.InsertAsync(entity); - return Json(jm); + return jm; } #endregion @@ -165,7 +165,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -173,12 +173,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -191,10 +191,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] SysMenu entity) + public async Task DoEdit([FromBody] SysMenu entity) { var jm = await _sysMenuServices.UpdateAsync(entity); - return Json(jm); + return jm; } #endregion @@ -207,7 +207,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -216,7 +216,7 @@ namespace CoreCms.Net.Web.Admin.Controllers - return Json(jm); + return jm; @@ -233,14 +233,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task ImportButtons([FromBody] FMSysMenuToImportButton entity) + public async Task ImportButtons([FromBody] FMSysMenuToImportButton entity) { var jm = new AdminUiCallBack(); if (entity.data.Count <= 0) { jm.msg = "请选择要导入的按钮"; - return Json(jm); + return jm; } //清空旗下按钮 @@ -272,7 +272,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { await _sysMenuServices.UpdateCaChe(); } - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysNLogRecordsController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysNLogRecordsController.cs index 3af731b..be21434 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysNLogRecordsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysNLogRecordsController.cs @@ -39,7 +39,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class SysNLogRecordsController : Controller + public class SysNLogRecordsController : ControllerBase { private readonly ISysNLogRecordsServices _sysNLogRecordsServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -201,7 +201,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -215,11 +215,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -234,7 +234,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -242,13 +242,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _sysNLogRecordsServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } @@ -264,7 +264,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除")] - public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) + public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -272,7 +272,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -287,7 +287,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -295,14 +295,14 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -317,7 +317,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -381,7 +381,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -395,7 +395,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -514,7 +514,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -528,7 +528,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("清空数据")] - public async Task DoWipeData() + public async Task DoWipeData() { var jm = new AdminUiCallBack(); @@ -536,7 +536,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysOperRecordController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysOperRecordController.cs index 0376a9e..979a87a 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysOperRecordController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysOperRecordController.cs @@ -40,20 +40,20 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class SysOperRecordController : Controller + public class SysOperRecordController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; - private readonly ISysOperRecordServices _SysOperRecordServices; + private readonly ISysOperRecordServices _sysOperRecordServices; /// /// 构造函数 /// public SysOperRecordController(IWebHostEnvironment webHostEnvironment - ,ISysOperRecordServices SysOperRecordServices + ,ISysOperRecordServices sysOperRecordServices ) { _webHostEnvironment = webHostEnvironment; - _SysOperRecordServices = SysOperRecordServices; + _sysOperRecordServices = sysOperRecordServices; } #region 获取列表============================================================ @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -186,13 +186,13 @@ namespace CoreCms.Net.Web.Admin.Controllers } } //获取数据 - var list = await _SysOperRecordServices.QueryPageAsync(where, orderEx, orderBy, pageCurrent, pageSize, true); + var list = await _sysOperRecordServices.QueryPageAsync(where, orderEx, orderBy, pageCurrent, pageSize, true); //返回数据 jm.data = list; jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -204,11 +204,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -220,89 +220,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion - #region 创建提交============================================================ - // POST: Api/SysOperRecord/DoCreate - /// - /// 创建提交 - /// - /// - /// - [HttpPost] - [Description("创建提交")] - public async Task DoCreate([FromBody]SysOperRecord entity) - { - var jm = await _SysOperRecordServices.InsertAsync(entity); - return Json(jm); - } - #endregion - - #region 编辑数据============================================================ - // POST: Api/SysOperRecord/GetEdit - /// - /// 编辑数据 - /// - /// - /// - [HttpPost] - [Description("编辑数据")] - public async Task GetEdit([FromBody]FMIntId entity) - { - var jm = new AdminUiCallBack(); - - var model = await _SysOperRecordServices.QueryByIdAsync(entity.id, false); - if (model == null) - { - jm.msg = "不存在此信息"; - return Json(jm); - } - jm.code = 0; - jm.data = model; - - return Json(jm); - } - #endregion - - #region 编辑提交============================================================ - // POST: Api/SysOperRecord/Edit - /// - /// 编辑提交 - /// - /// - /// - [HttpPost] - [Description("编辑提交")] - public async Task DoEdit([FromBody]SysOperRecord entity) - { - var jm = await _SysOperRecordServices.UpdateAsync(entity); - return Json(jm); - } - #endregion - - #region 批量删除============================================================ - // POST: Api/SysOperRecord/DoBatchDelete/10,11,20 - /// - /// 批量删除 - /// - /// - /// - [HttpPost] - [Description("批量删除")] - public async Task DoBatchDelete([FromBody]FMArrayIntIds entity) - { - var jm = await _SysOperRecordServices.DeleteByIdsAsync(entity.id); - return Json(jm); - } - - #endregion - #region 预览数据============================================================ // POST: Api/SysOperRecord/GetDetails/10 /// @@ -312,20 +237,20 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody]FMIntId entity) + public async Task GetDetails([FromBody]FMIntId entity) { var jm = new AdminUiCallBack(); - var model = await _SysOperRecordServices.QueryByIdAsync(entity.id, false); + var model = await _sysOperRecordServices.QueryByIdAsync(entity.id, false); if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -338,7 +263,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody]FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody]FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -347,7 +272,7 @@ namespace CoreCms.Net.Web.Admin.Controllers //添加一个sheet var mySheet = book.CreateSheet("Sheet1"); //获取list数据 - var listModel = await _SysOperRecordServices.QueryListByClauseAsync(p => entity.id.Contains(p.id), p => p.id, OrderByType.Asc, true); + var listModel = await _sysOperRecordServices.QueryListByClauseAsync(p => entity.id.Contains(p.id), p => p.id, OrderByType.Asc, true); //给sheet1添加第一行的头部标题 var headerRow = mySheet.CreateRow(0); var headerStyle = ExcelHelper.GetHeaderStyle(book); @@ -505,7 +430,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -517,7 +442,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -615,7 +540,7 @@ namespace CoreCms.Net.Web.Admin.Controllers //添加一个sheet var mySheet = book.CreateSheet("Sheet1"); //获取list数据 - var listModel = await _SysOperRecordServices.QueryListByClauseAsync(where, p => p.id, OrderByType.Asc, true); + var listModel = await _sysOperRecordServices.QueryListByClauseAsync(where, p => p.id, OrderByType.Asc, true); //给sheet1添加第一行的头部标题 var headerRow = mySheet.CreateRow(0); var headerStyle = ExcelHelper.GetHeaderStyle(book); @@ -802,7 +727,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysOrganizationController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysOrganizationController.cs index 50cf3ce..1b0908c 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysOrganizationController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysOrganizationController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class SysOrganizationController : Controller + public class SysOrganizationController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ISysOrganizationServices _sysOrganizationServices; @@ -69,7 +69,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); @@ -80,7 +80,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.Count; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -92,11 +92,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -108,7 +108,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public async Task GetCreate() + public async Task GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -124,7 +124,7 @@ namespace CoreCms.Net.Web.Admin.Controllers dictData }; - return Json(jm); + return jm; } #endregion @@ -137,7 +137,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] SysOrganization entity) + public async Task DoCreate([FromBody] SysOrganization entity) { var jm = new AdminUiCallBack(); @@ -145,7 +145,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = (bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure); - return Json(jm); + return jm; } #endregion @@ -158,7 +158,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -166,7 +166,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var dict = await _sysDictionaryServices.QueryByClauseAsync(p => p.dictCode == "organization_type"); @@ -182,7 +182,7 @@ namespace CoreCms.Net.Web.Admin.Controllers dictData }; - return Json(jm); + return jm; } #endregion @@ -195,7 +195,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] SysOrganization entity) + public async Task DoEdit([FromBody] SysOrganization entity) { var jm = new AdminUiCallBack(); @@ -203,7 +203,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 //oldModel.id = entity.id; @@ -223,7 +223,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -236,7 +236,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -244,12 +244,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _sysOrganizationServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -266,7 +266,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置leader")] - public async Task DoSetSysOrganizationLeader([FromBody] FMDoSetSysOrganizationLeaderPost entity) + public async Task DoSetSysOrganizationLeader([FromBody] FMDoSetSysOrganizationLeaderPost entity) { var jm = new AdminUiCallBack(); @@ -274,14 +274,14 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.leaderId = entity.leaderId; var bl = await _sysOrganizationServices.UpdateAsync(oldModel); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.SetDataSuccess : GlobalConstVars.SetDataFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysRoleController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysRoleController.cs index 7b72b8e..45f4bfc 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysRoleController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysRoleController.cs @@ -39,7 +39,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class SysRoleController : Controller + public class SysRoleController : ControllerBase { private readonly ISysMenuServices _sysMenuServices; private readonly ISysRoleMenuServices _sysRoleMenuServices; @@ -70,7 +70,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -180,7 +180,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -194,11 +194,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -212,11 +212,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -231,7 +231,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] SysRole entity) + public async Task DoCreate([FromBody] SysRole entity) { var jm = new AdminUiCallBack(); @@ -241,7 +241,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure; - return Json(jm); + return jm; } #endregion @@ -256,7 +256,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -264,13 +264,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -285,7 +285,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] SysRole entity) + public async Task DoEdit([FromBody] SysRole entity) { var jm = new AdminUiCallBack(); @@ -293,7 +293,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -307,7 +307,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -322,7 +322,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -330,13 +330,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _sysRoleServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -351,7 +351,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除")] - public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) + public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -359,7 +359,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -374,7 +374,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取权限设置")] - public async Task GetRoleSet([FromBody] FMIntId entity) + public async Task GetRoleSet([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -382,13 +382,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -403,7 +403,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取菜单")] - public async Task GetSysMenu([FromBody] FMIntId entity) + public async Task GetSysMenu([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -412,7 +412,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var roleMenus = await _sysRoleMenuServices.QueryListByClauseAsync(p => p.roleId == entity.id); @@ -451,7 +451,7 @@ namespace CoreCms.Net.Web.Admin.Controllers roleMenus }; - return Json(jm); + return jm; } #endregion @@ -466,7 +466,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置权限")] - public async Task DoSetSysMenu([FromBody] FMIntIdByListIntData entity) + public async Task DoSetSysMenu([FromBody] FMIntIdByListIntData entity) { var jm = new AdminUiCallBack(); @@ -474,7 +474,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } await _sysRoleMenuServices.DeleteAsync(p => p.roleId == oldModel.id); @@ -496,7 +496,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.msg = "权限设置成功"; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysRoleMenuController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysRoleMenuController.cs index eaa7e6e..10682d3 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysRoleMenuController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysRoleMenuController.cs @@ -39,7 +39,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class SysRoleMenuController : Controller + public class SysRoleMenuController : ControllerBase { private readonly ISysRoleMenuServices _sysRoleMenuServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -159,7 +159,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -173,11 +173,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -191,11 +191,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -210,7 +210,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] SysRoleMenu entity) + public async Task DoCreate([FromBody] SysRoleMenu entity) { var jm = new AdminUiCallBack(); @@ -219,7 +219,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure; - return Json(jm); + return jm; } #endregion @@ -234,7 +234,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -242,14 +242,14 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -264,7 +264,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] SysRoleMenu entity) + public async Task DoEdit([FromBody] SysRoleMenu entity) { var jm = new AdminUiCallBack(); @@ -272,7 +272,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -287,7 +287,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -302,7 +302,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -310,13 +310,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _sysRoleMenuServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -331,7 +331,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除")] - public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) + public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -339,7 +339,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -354,7 +354,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -362,13 +362,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -383,7 +383,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -429,7 +429,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -443,7 +443,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -517,7 +517,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysTaskLogController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysTaskLogController.cs index 234d44d..7e7e580 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysTaskLogController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysTaskLogController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class SysTaskLogController : Controller + public class SysTaskLogController : ControllerBase { private readonly ISysTaskLogServices _sysTaskLogServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -65,7 +65,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -147,7 +147,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -161,11 +161,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -180,7 +180,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -188,13 +188,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _sysTaskLogServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -209,7 +209,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除")] - public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) + public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -217,7 +217,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -232,7 +232,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -240,14 +240,14 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -262,7 +262,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -347,7 +347,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -361,7 +361,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -478,7 +478,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -493,7 +493,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否完成")] - public async Task DoSetisSuccess([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisSuccess([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -501,7 +501,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isSuccess = entity.data; @@ -510,7 +510,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -524,7 +524,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("清空数据")] - public async Task DoWipeData() + public async Task DoWipeData() { var jm = new AdminUiCallBack(); @@ -532,7 +532,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysUserController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysUserController.cs index 6adf444..3587dd3 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysUserController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysUserController.cs @@ -39,7 +39,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class SysUserController : Controller + public class SysUserController : ControllerBase { private readonly ISysOrganizationServices _sysOrganizationServices; private readonly ISysRoleServices _sysRoleServices; @@ -73,7 +73,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -275,7 +275,7 @@ namespace CoreCms.Net.Web.Admin.Controllers } - return Json(jm); + return jm; } #endregion @@ -289,11 +289,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -307,7 +307,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public async Task GetCreate() + public async Task GetCreate() { //返回数据 var userSexTypes = EnumHelper.EnumToList(); @@ -317,7 +317,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = new { userSexTypes, roles }; - return Json(jm); + return jm; } #endregion @@ -332,7 +332,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] SysUser entity) + public async Task DoCreate([FromBody] SysUser entity) { var jm = new AdminUiCallBack(); @@ -340,7 +340,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (haveName) { jm.msg = "账号已经存在"; - return Json(jm); + return jm; } entity.createTime = DateTime.Now; @@ -369,7 +369,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure; - return Json(jm); + return jm; } #endregion @@ -384,7 +384,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -392,7 +392,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var userSexTypes = EnumHelper.EnumToList(); @@ -410,7 +410,7 @@ namespace CoreCms.Net.Web.Admin.Controllers roleIds }; - return Json(jm); + return jm; } #endregion @@ -425,7 +425,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] SysUser entity) + public async Task DoEdit([FromBody] SysUser entity) { var jm = new AdminUiCallBack(); @@ -433,7 +433,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } @@ -443,7 +443,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (haveName) { jm.msg = "账号已经存在"; - return Json(jm); + return jm; } } @@ -488,7 +488,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -503,7 +503,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -511,13 +511,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } if (model.id == 1) { jm.msg = "初始管理员账户禁止删除"; - return Json(jm); + return jm; } var bl = await _sysUserServices.DeleteByIdAsync(entity.id); @@ -525,7 +525,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -540,7 +540,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否锁定,0否,1是")] - public async Task DoSetState([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetState([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -548,7 +548,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.state = entity.data ? 0 : 1; @@ -557,7 +557,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysUserRoleController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysUserRoleController.cs index 7fa82c7..c4ac613 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysUserRoleController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysUserRoleController.cs @@ -39,7 +39,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class SysUserRoleController : Controller + public class SysUserRoleController : ControllerBase { private readonly ISysUserRoleServices _sysUserRoleServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -159,7 +159,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -173,11 +173,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -191,11 +191,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -210,7 +210,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] SysUserRole entity) + public async Task DoCreate([FromBody] SysUserRole entity) { var jm = new AdminUiCallBack(); @@ -218,7 +218,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure; - return Json(jm); + return jm; } #endregion @@ -233,7 +233,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -241,14 +241,14 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -263,7 +263,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] SysUserRole entity) + public async Task DoEdit([FromBody] SysUserRole entity) { var jm = new AdminUiCallBack(); @@ -271,7 +271,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -286,7 +286,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -301,7 +301,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -309,13 +309,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _sysUserRoleServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } @@ -331,7 +331,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除")] - public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) + public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -339,7 +339,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -354,7 +354,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -362,13 +362,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -383,7 +383,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -430,7 +430,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -444,7 +444,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -518,7 +518,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserBalanceController.cs b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserBalanceController.cs index 2926978..7cc86b6 100644 --- a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserBalanceController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserBalanceController.cs @@ -39,7 +39,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsUserBalanceController : Controller + public class CoreCmsUserBalanceController : ControllerBase { private readonly ICoreCmsUserBalanceServices _coreCmsUserBalanceServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -66,7 +66,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -165,7 +165,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion 获取列表============================================================ @@ -179,7 +179,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -189,7 +189,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { userBalanceSourceTypes }; - return Json(jm); + return jm; } #endregion 首页数据============================================================ @@ -204,7 +204,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -212,13 +212,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion 预览数据============================================================ @@ -233,7 +233,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -285,7 +285,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion 选择导出============================================================ @@ -299,7 +299,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -377,7 +377,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion 查询导出============================================================ diff --git a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs index bdb48a5..8729cdc 100644 --- a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsUserController : Controller + public class CoreCmsUserController : ControllerBase { private readonly ICoreCmsUserBalanceServices _coreCmsUserBalanceServices; private readonly ICoreCmsUserGradeServices _coreCmsUserGradeServices; @@ -81,7 +81,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -239,7 +239,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -253,7 +253,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public async Task GetIndex() + public async Task GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -269,7 +269,7 @@ namespace CoreCms.Net.Web.Admin.Controllers userGrade, userAccountTypes }; - return Json(jm); + return jm; } #endregion @@ -283,7 +283,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public async Task GetCreate() + public async Task GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -291,7 +291,7 @@ namespace CoreCms.Net.Web.Admin.Controllers var userGrade = await _coreCmsUserGradeServices.QueryAsync(); jm.data = userGrade; - return Json(jm); + return jm; } #endregion @@ -306,21 +306,21 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsUser entity) + public async Task DoCreate([FromBody] CoreCmsUser entity) { var jm = new AdminUiCallBack(); if (string.IsNullOrEmpty(entity.mobile)) { jm.msg = "请输入用户手机号"; - return Json(jm); + return jm; } var isHava = await _coreCmsUserServices.ExistsAsync(p => p.mobile == entity.mobile); if (isHava) { jm.msg = "已存在此手机号码"; - return Json(jm); + return jm; } entity.createTime = DateTime.Now; @@ -332,7 +332,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure; - return Json(jm); + return jm; } #endregion @@ -347,7 +347,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -355,7 +355,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; @@ -371,7 +371,7 @@ namespace CoreCms.Net.Web.Admin.Controllers userStatus }; - return Json(jm); + return jm; } #endregion @@ -386,7 +386,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsUser entity) + public async Task DoEdit([FromBody] CoreCmsUser entity) { var jm = new AdminUiCallBack(); @@ -394,7 +394,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } if (entity.mobile != oldModel.mobile) @@ -403,7 +403,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (isHava) { jm.msg = "已存在此手机号码"; - return Json(jm); + return jm; } } @@ -423,7 +423,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -437,7 +437,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -631,7 +631,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -643,7 +643,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -972,7 +972,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -985,7 +985,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("修改余额")] - public async Task GetEditBalance([FromBody] FMIntId entity) + public async Task GetEditBalance([FromBody] FMIntId entity) { //返回数据 var jm = new AdminUiCallBack(); @@ -994,13 +994,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -1015,10 +1015,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("修改余额提交")] - public async Task DoEditBalance([FromBody] FMUpdateDecimalDataByIntId entity) + public async Task DoEditBalance([FromBody] FMUpdateDecimalDataByIntId entity) { var jm = await _coreCmsUserServices.UpdateBalance(entity.id, entity.data); - return Json(jm); + return jm; } #endregion @@ -1032,7 +1032,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("修改积分")] - public async Task GetEditPoint([FromBody] FMIntId entity) + public async Task GetEditPoint([FromBody] FMIntId entity) { //返回数据 var jm = new AdminUiCallBack(); @@ -1041,13 +1041,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -1062,10 +1062,10 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("修改积分提交")] - public async Task DoEditPoint([FromBody] FMUpdateUserPoint entity) + public async Task DoEditPoint([FromBody] FMUpdateUserPoint entity) { var jm = await _coreCmsUserServices.UpdatePiont(entity); - return Json(jm); + return jm; } #endregion @@ -1079,7 +1079,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("余额详情列表")] - public async Task GetUserBalancePageList() + public async Task GetUserBalancePageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -1170,7 +1170,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -1184,7 +1184,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("余额详情")] - public JsonResult GetDetailsBalanceLog() + public AdminUiCallBack GetDetailsBalanceLog() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -1194,7 +1194,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { userBalanceSourceTypes }; - return Json(jm); + return jm; } #endregion @@ -1208,7 +1208,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetUserPointLogPageList() + public async Task GetUserPointLogPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -1300,7 +1300,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -1314,7 +1314,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("余额详情")] - public JsonResult GetDetailsPointLog() + public AdminUiCallBack GetDetailsPointLog() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -1323,7 +1323,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { userPointSourceTypes }; - return Json(jm); + return jm; } #endregion @@ -1338,7 +1338,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置删除标志")] - public async Task DoSetisDelete([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisDelete([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -1346,7 +1346,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isDelete = entity.data; @@ -1355,7 +1355,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserGradeController.cs b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserGradeController.cs index c2d3b1f..c8d61d7 100644 --- a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserGradeController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserGradeController.cs @@ -37,7 +37,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsUserGradeController : Controller + public class CoreCmsUserGradeController : ControllerBase { private readonly ICoreCmsUserGradeServices _coreCmsUserGradeServices; private readonly ICoreCmsUserServices _userServices; @@ -63,7 +63,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -117,7 +117,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -131,14 +131,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -152,14 +152,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -174,7 +174,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsUserGrade entity) + public async Task DoCreate([FromBody] CoreCmsUserGrade entity) { var jm = new AdminUiCallBack(); @@ -191,7 +191,7 @@ namespace CoreCms.Net.Web.Admin.Controllers predicate); } - return Json(jm); + return jm; } #endregion @@ -206,7 +206,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -214,13 +214,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -235,7 +235,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsUserGrade entity) + public async Task DoEdit([FromBody] CoreCmsUserGrade entity) { var jm = new AdminUiCallBack(); @@ -243,7 +243,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var oldDf = oldModel.isDefault; @@ -251,7 +251,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldDf && entity.isDefault == false) { jm.msg = "请保留一个为默认等级"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -271,7 +271,7 @@ namespace CoreCms.Net.Web.Admin.Controllers predicate); } - return Json(jm); + return jm; } #endregion @@ -286,7 +286,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -294,27 +294,27 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var isHave = await _userServices.ExistsAsync(p => p.grade == model.id); if (isHave) { jm.msg = "存在下级关联数据,禁止删除"; - return Json(jm); + return jm; } var isDefault = await _coreCmsUserGradeServices.ExistsAsync(p => p.isDefault && p.id != entity.id); if (isDefault == false) { jm.msg = "请先设置其他选项为默认"; - return Json(jm); + return jm; } var bl = await _coreCmsUserGradeServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } @@ -330,7 +330,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -338,13 +338,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -359,7 +359,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置是否默认")] - public async Task DoSetisDefault([FromBody] FMUpdateBoolDataByIntId entity) + public async Task DoSetisDefault([FromBody] FMUpdateBoolDataByIntId entity) { var jm = new AdminUiCallBack(); @@ -367,7 +367,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } oldModel.isDefault = entity.data; @@ -378,7 +378,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (isHave == false) { jm.msg = "请保持一个默认设置"; - return Json(jm); + return jm; } } @@ -394,7 +394,7 @@ namespace CoreCms.Net.Web.Admin.Controllers predicate); } - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserTocashController.cs b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserTocashController.cs index ba45bd5..26da791 100644 --- a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserTocashController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserTocashController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsUserTocashController : Controller + public class CoreCmsUserTocashController : ControllerBase { private readonly ICoreCmsUserTocashServices _coreCmsUserTocashServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -67,7 +67,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -205,7 +205,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -219,7 +219,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -230,7 +230,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { userTocashTypes }; - return Json(jm); + return jm; } #endregion @@ -246,7 +246,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("设置状态")] - public async Task SetStatus([FromBody] FMIntId entity) + public async Task SetStatus([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -254,7 +254,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } var res = await _coreCmsUserTocashServices.Examine(entity.id, entity.data.ObjectToInt(0)); @@ -262,7 +262,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = res.data; jm.msg = res.status ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -278,7 +278,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -339,7 +339,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -353,7 +353,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -461,7 +461,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/WeChat/CoreCmsUserWeChatInfoController.cs b/CoreCms.Net.Web.Admin/Controllers/WeChat/CoreCmsUserWeChatInfoController.cs index a87fec1..25f1be8 100644 --- a/CoreCms.Net.Web.Admin/Controllers/WeChat/CoreCmsUserWeChatInfoController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/WeChat/CoreCmsUserWeChatInfoController.cs @@ -39,7 +39,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsUserWeChatInfoController : Controller + public class CoreCmsUserWeChatInfoController : ControllerBase { private readonly ICoreCmsUserWeChatInfoServices _coreCmsUserWeChatInfoServices; private readonly IWebHostEnvironment _webHostEnvironment; @@ -66,7 +66,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("获取列表")] - public async Task GetPageList() + public async Task GetPageList() { var jm = new AdminUiCallBack(); var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); @@ -234,7 +234,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; jm.count = list.TotalCount; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -248,11 +248,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public JsonResult GetIndex() + public AdminUiCallBack GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -266,11 +266,11 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建数据")] - public JsonResult GetCreate() + public AdminUiCallBack GetCreate() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - return Json(jm); + return jm; } #endregion @@ -285,7 +285,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("创建提交")] - public async Task DoCreate([FromBody] CoreCmsUserWeChatInfo entity) + public async Task DoCreate([FromBody] CoreCmsUserWeChatInfo entity) { var jm = new AdminUiCallBack(); @@ -293,7 +293,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure; - return Json(jm); + return jm; } #endregion @@ -308,7 +308,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -316,13 +316,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -337,7 +337,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] CoreCmsUserWeChatInfo entity) + public async Task DoEdit([FromBody] CoreCmsUserWeChatInfo entity) { var jm = new AdminUiCallBack(); @@ -345,7 +345,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (oldModel == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } //事物处理过程开始 @@ -372,7 +372,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return Json(jm); + return jm; } #endregion @@ -387,7 +387,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("单选删除")] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -395,13 +395,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var bl = await _coreCmsUserWeChatInfoServices.DeleteByIdAsync(entity.id); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } @@ -417,7 +417,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("批量删除")] - public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) + public async Task DoBatchDelete([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -425,7 +425,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -440,7 +440,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("预览数据")] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -448,13 +448,13 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -469,7 +469,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("选择导出")] - public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) + public async Task SelectExportExcel([FromBody] FMArrayIntIds entity) { var jm = new AdminUiCallBack(); @@ -540,7 +540,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion @@ -554,7 +554,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("查询导出")] - public async Task QueryExportExcel() + public async Task QueryExportExcel() { var jm = new AdminUiCallBack(); @@ -688,7 +688,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = GlobalConstVars.ExcelExportSuccess; jm.data = tpath + fileName; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Controllers/WeChat/CoreCmsUserWeChatMsgTemplateController.cs b/CoreCms.Net.Web.Admin/Controllers/WeChat/CoreCmsUserWeChatMsgTemplateController.cs index 761a450..6af5134 100644 --- a/CoreCms.Net.Web.Admin/Controllers/WeChat/CoreCmsUserWeChatMsgTemplateController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/WeChat/CoreCmsUserWeChatMsgTemplateController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.Admin.Controllers [ApiController] [RequiredErrorForAdmin] [Authorize(Permissions.Name)] - public class CoreCmsUserWeChatMsgTemplateController : Controller + public class CoreCmsUserWeChatMsgTemplateController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsUserWeChatMsgTemplateServices _coreCmsUserWeChatMsgTemplateServices; @@ -64,7 +64,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("首页数据")] - public async Task GetIndex() + public async Task GetIndex() { //返回数据 var jm = new AdminUiCallBack { code = 0 }; @@ -88,7 +88,7 @@ namespace CoreCms.Net.Web.Admin.Controllers refund }; - return Json(jm); + return jm; } #endregion @@ -101,7 +101,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑数据")] - public async Task GetEdit([FromBody] FMIntId entity) + public async Task GetEdit([FromBody] FMIntId entity) { var jm = new AdminUiCallBack(); @@ -109,12 +109,12 @@ namespace CoreCms.Net.Web.Admin.Controllers if (model == null) { jm.msg = "不存在此信息"; - return Json(jm); + return jm; } jm.code = 0; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -127,14 +127,14 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("编辑提交")] - public async Task DoEdit([FromBody] FMWeChatMsgTemplateEdit entity) + public async Task DoEdit([FromBody] FMWeChatMsgTemplateEdit entity) { var jm = new AdminUiCallBack(); if (entity.list == null || entity.list.Count < 0) { jm.msg = "未传输讯息"; - return Json(jm); + return jm; } //事物处理过程开始 var data = await _coreCmsUserWeChatMsgTemplateServices.QueryAsync(); @@ -157,7 +157,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; jm.otherData = entity; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Doc.xml b/CoreCms.Net.Web.Admin/Doc.xml index 6ca4922..60b10d0 100644 --- a/CoreCms.Net.Web.Admin/Doc.xml +++ b/CoreCms.Net.Web.Admin/Doc.xml @@ -525,23 +525,6 @@ - - - 演示类 - - - - - 用于测试及演示用 - - - - - - 默认首页 - - - 用户授权登录 @@ -571,7 +554,7 @@ 后端常用方法 - + 构造函数 @@ -642,6 +625,12 @@ + + + 后台生成预览页面设计小程序码 + + + 获取商品列表 @@ -2443,6 +2432,13 @@ + + + 还原订单 + + + + 判断是否存在售后 @@ -3421,6 +3417,13 @@ + + + 复制数据 + + + + 版面设计 @@ -4416,34 +4419,6 @@ - - - 创建提交 - - - - - - - 编辑数据 - - - - - - - 编辑提交 - - - - - - - 批量删除 - - - - 预览数据 diff --git a/CoreCms.Net.Web.WebApi/Controllers/AdvertController.cs b/CoreCms.Net.Web.WebApi/Controllers/AdvertController.cs index c1c17d7..1c1f57f 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/AdvertController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/AdvertController.cs @@ -29,7 +29,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class AdvertController : Controller + public class AdvertController : ControllerBase { private IHttpContextUser _user; @@ -63,7 +63,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetAdvertList([FromBody] FMPageByIntId entity) + public async Task GetAdvertList([FromBody] FMPageByIntId entity) { var jm = new WebApiCallBack(); @@ -72,7 +72,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = true; jm.data = list; - return Json(jm); + return jm; } #endregion @@ -84,14 +84,14 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetPositionList([FromBody] WxAdvert entity) + public async Task GetPositionList([FromBody] WxAdvert entity) { var jm = new WebApiCallBack(); var position = await _advertPositionServices.QueryListByClauseAsync(p => p.isEnable && p.code == entity.codes); if (!position.Any()) { - return Json(jm); + return jm; } var ids = position.Select(p => p.id).ToList(); var isement = await _advertisementServices.QueryListByClauseAsync(p => ids.Contains(p.positionId)); @@ -102,7 +102,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = true; jm.data = list; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.WebApi/Controllers/AgentController.cs b/CoreCms.Net.Web.WebApi/Controllers/AgentController.cs index c67e798..37bbbf1 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/AgentController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/AgentController.cs @@ -34,7 +34,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class AgentController : Controller + public class AgentController : ControllerBase { private IHttpContextUser _user; private readonly ICoreCmsAgentServices _agentServices; @@ -73,23 +73,23 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetStoreInfo([FromBody] FMIntId entity) + public async Task GetStoreInfo([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); if (entity.id == 0) { jm.msg = "店铺信息丢失"; - return Json(jm); + return jm; } var store = UserHelper.GetUserIdByShareCode(entity.id); if (store <= 0) { jm.msg = "店铺信息丢失"; - return Json(jm); + return jm; } jm = await _agentServices.GetStore(store); - return Json(jm); + return jm; } #endregion @@ -101,7 +101,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetGoodsPageList([FromBody] FMPageByWhereOrder entity) + public async Task GetGoodsPageList([FromBody] FMPageByWhereOrder entity) { var jm = new WebApiCallBack(); @@ -192,7 +192,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers }; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -207,10 +207,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task Info() + public async Task Info() { var jm = await _agentServices.GetInfo(_user.ID); - return Json(jm); + return jm; } #endregion @@ -222,14 +222,14 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task ApplyAgent([FromBody] FMAgentApply entity) + public async Task ApplyAgent([FromBody] FMAgentApply entity) { var jm = new WebApiCallBack(); if (entity.agreement != "on") { jm.msg = "请勾选代理商协议"; - return Json(jm); + return jm; } var iData = new CoreCmsAgent(); iData.mobile = entity.mobile; @@ -238,7 +238,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers iData.qq = entity.qq; jm = await _agentServices.AddData(iData, _user.ID); - return Json(jm); + return jm; } #endregion @@ -250,7 +250,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetTeamSum() + public async Task GetTeamSum() { var jm = new WebApiCallBack(); @@ -286,7 +286,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers monthSecond }; - return Json(jm); + return jm; } #endregion @@ -298,7 +298,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetOrderSum() + public async Task GetOrderSum() { var jm = new WebApiCallBack(); @@ -344,7 +344,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers monthOrderMoney }; - return Json(jm); + return jm; } #endregion @@ -356,10 +356,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task MyOrder([FromBody] FMPageByIntId entity) + public async Task MyOrder([FromBody] FMPageByIntId entity) { var jm = await _agentServices.GetMyOrderList(_user.ID, entity.page, entity.limit, entity.id); - return Json(jm); + return jm; } #endregion @@ -370,24 +370,24 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task SetStore([FromBody] FMSetAgentStorePost entity) + public async Task SetStore([FromBody] FMSetAgentStorePost entity) { var jm = new WebApiCallBack(); if (string.IsNullOrEmpty(entity.storeName)) { jm.msg = "请填写店铺名称"; - return Json(jm); + return jm; } if (string.IsNullOrEmpty(entity.storeLogo)) { jm.msg = "请上传店铺logo"; - return Json(jm); + return jm; } if (string.IsNullOrEmpty(entity.storeBanner)) { jm.msg = "请上传店铺banner"; - return Json(jm); + return jm; } var info = await _agentServices.QueryByClauseAsync(p => p.userId == _user.ID); @@ -402,7 +402,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = true; jm.msg = "保存成功"; - return Json(jm); + return jm; } #endregion @@ -414,7 +414,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetAgentRanking([FromBody] FMPageByIntId entity) + public async Task GetAgentRanking([FromBody] FMPageByIntId entity) { var jm = new WebApiCallBack(); @@ -433,7 +433,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers }; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.WebApi/Controllers/ArticleController.cs b/CoreCms.Net.Web.WebApi/Controllers/ArticleController.cs index f237b23..c158c17 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/ArticleController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/ArticleController.cs @@ -24,7 +24,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class ArticleController : Controller + public class ArticleController : ControllerBase { private IHttpContextUser _user; @@ -52,7 +52,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task NoticeList([FromBody] FMPageByIntId entity) + public async Task NoticeList([FromBody] FMPageByIntId entity) { var jm = new WebApiCallBack(); @@ -61,7 +61,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = true; jm.data = list; - return Json(jm); + return jm; } #endregion @@ -73,7 +73,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetArticleList([FromBody] FMPageByIntId entity) + public async Task GetArticleList([FromBody] FMPageByIntId entity) { var jm = new WebApiCallBack(); @@ -96,7 +96,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers count = list.TotalCount }; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.WebApi/Controllers/CartController.cs b/CoreCms.Net.Web.WebApi/Controllers/CartController.cs index 108367e..715c0bc 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/CartController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/CartController.cs @@ -25,7 +25,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class CartController : Controller + public class CartController : ControllerBase { private readonly IHttpContextUser _user; private readonly ICoreCmsCartServices _cartServices; @@ -53,10 +53,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task AddCart([FromBody] FMCartAdd entity) + public async Task AddCart([FromBody] FMCartAdd entity) { var jm = await _cartServices.Add(_user.ID, entity.ProductId, entity.Nums, entity.type, entity.cartType, entity.teamId, entity.groupId); - return Json(jm); + return jm; } #endregion 添加单个货品到购物车 @@ -69,7 +69,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetList([FromBody] FMCartGetList entity) + public async Task GetList([FromBody] FMCartGetList entity) { var ids = CommonHelper.StringToIntArray(entity.ids); //判断免费运费 @@ -77,7 +77,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers //获取数据 var jm = await _cartServices.GetCartInfos(_user.ID, ids, entity.type, entity.areaId, entity.point, entity.couponCode, freeFreight, entity.receiptType, entity.groupId); - return Json(jm); + return jm; } #endregion 获取购物车列表====================================================================== @@ -90,18 +90,18 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task DoDelete([FromBody] FMIntId entity) + public async Task DoDelete([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); if (entity.id <= 0) { jm.msg = "请提交要删除的货品"; - return Json(jm); + return jm; } jm = await _cartServices.DeleteByIdsAsync(entity.id, _user.ID); - return Json(jm); + return jm; } #endregion 删除购物车信息 @@ -114,10 +114,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task SetCartNum([FromBody] FMSetCartNum entity) + public async Task SetCartNum([FromBody] FMSetCartNum entity) { var jm = await _cartServices.SetCartNum(entity.id, entity.nums, _user.ID, 2, 1); - return Json(jm); + return jm; } #endregion 设置购物车商品数量 @@ -130,11 +130,11 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetCartAvailableCoupon([FromBody] FMCouponForUserCouponPost entity) + public async Task GetCartAvailableCoupon([FromBody] FMCouponForUserCouponPost entity) { var ids = CommonHelper.StringToIntArray(entity.ids); var jm = await _cartServices.GetCartAvailableCoupon(_user.ID, ids); - return Json(jm); + return jm; } #endregion 根据提交的数据判断哪些购物券可以使用================================================== diff --git a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs index 8c929ba..6f2bcdd 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs @@ -40,7 +40,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class CommonController : Controller + public class CommonController : ControllerBase { private readonly IWebHostEnvironment _webHostEnvironment; private readonly ICoreCmsSettingServices _settingServices; @@ -73,10 +73,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public JsonResult InterFaceTest() + public WebApiCallBack InterFaceTest() { var jm = new WebApiCallBack { status = true, msg = "接口访问正常", data = DateTime.Now }; - return Json(jm); + return jm; } #endregion @@ -87,7 +87,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetConfigV2() + public async Task GetConfigV2() { var jm = new WebApiCallBack { status = true, msg = "接口访问正常", data = DateTime.Now }; var allConfigs = await _settingServices.GetConfigDictionaries(); @@ -198,7 +198,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers agentAgreement }; jm.data = model; - return Json(jm); + return jm; } #endregion @@ -209,7 +209,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetAreas() + public async Task GetAreas() { var jm = new WebApiCallBack(); @@ -217,7 +217,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = true; jm.data = AreaHelper.GetList(areas); - return Json(jm); + return jm; } #endregion @@ -229,7 +229,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetServiceDescription() + public async Task GetServiceDescription() { var jm = new WebApiCallBack(); @@ -241,7 +241,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers service = caCheList.Where(p => p.type == (int)GlobalEnumVars.ShopServiceNoteType.Service && p.isShow == true).OrderBy(p => p.sortId).ToList(), delivery = caCheList.Where(p => p.type == (int)GlobalEnumVars.ShopServiceNoteType.Delivery && p.isShow == true).OrderBy(p => p.sortId).ToList() }; - return Json(jm); + return jm; } #endregion @@ -256,7 +256,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Authorize] [HttpPost] - public async Task UploadImages() + public async Task UploadImages() { var jm = new WebApiCallBack(); @@ -271,7 +271,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (file == null) { jm.msg = "请选择文件"; - return Json(jm); + return jm; } string fileName = file.FileName; string fileExt = Path.GetExtension(fileName).ToLowerInvariant(); @@ -280,7 +280,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (file.Length > maxSize) { jm.msg = "上传文件大小超过限制，最大允许上传" + filesStorageOptions.MaxSize + "M"; - return Json(jm); + return jm; } //检查文件扩展名 @@ -288,7 +288,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers Array.IndexOf(filesStorageOptions.FileTypes.Split(','), fileExt.Substring(1).ToLower()) == -1) { jm.msg = "上传文件扩展名是不允许的扩展名,请上传后缀名为：" + filesStorageOptions.FileTypes; - return Json(jm); + return jm; } string dts = DateTime.Now.ToString("yyyyMMddHHmmss_ffff", DateTimeFormatInfo.InvariantInfo); @@ -351,7 +351,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers src = filesStorageOptions.BucketBindUrl + filePath, imageId = dts }; - return Json(jm); + return jm; } } else if (filesStorageOptions.StorageType == GlobalEnumVars.FilesStorageOptionsType.QCloudOSS.ToString()) @@ -396,7 +396,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers } - return Json(jm); + return jm; } #endregion } diff --git a/CoreCms.Net.Web.WebApi/Controllers/CouponController.cs b/CoreCms.Net.Web.WebApi/Controllers/CouponController.cs index 5bdc3fd..b3dfa72 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/CouponController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/CouponController.cs @@ -27,7 +27,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class CouponController : Controller + public class CouponController : ControllerBase { private readonly IHttpContextUser _user; @@ -56,7 +56,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] //[Authorize] - public async Task CouponList([FromBody] FMCouponForUserCouponPost entity) + public async Task CouponList([FromBody] FMCouponForUserCouponPost entity) { var jm = new WebApiCallBack() { msg = "获取失败" }; @@ -78,7 +78,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers list.TotalPages }; } - return Json(jm); + return jm; } #endregion @@ -91,7 +91,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task CouponDetail([FromBody] FMIntId entity) + public async Task CouponDetail([FromBody] FMIntId entity) { var jm = new WebApiCallBack() { msg = "获取失败" }; @@ -99,7 +99,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers { jm.status = false; jm.msg = GlobalErrorCodeVars.Code15006; - return Json(jm); + return jm; } var promotionModel = await _promotionServices.QueryByClauseAsync(p => p.id == entity.id); @@ -109,7 +109,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.data = promotionModel; jm.msg = "获取成功"; } - return Json(jm); + return jm; } #endregion @@ -121,10 +121,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task UserCoupon([FromBody] FMCouponForUserCouponPost entity) + public async Task UserCoupon([FromBody] FMCouponForUserCouponPost entity) { var jm = await _couponServices.GetMyCoupon(_user.ID, 0, entity.display, entity.page, entity.limit); - return Json(jm); + return jm; } #endregion @@ -135,27 +135,27 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetCoupon([FromBody] FMIntId entity) + public async Task GetCoupon([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); if (entity.id == 0) { jm.msg = GlobalErrorCodeVars.Code15006; - return Json(jm); + return jm; } //判断优惠券是否可以领取? var promotionModel = await _promotionServices.ReceiveCoupon(entity.id); if (promotionModel.status == false) { - return Json(promotionModel); + return promotionModel; } var promotion = (CoreCmsPromotion)promotionModel.data; if (promotion == null) { jm.msg = GlobalErrorCodeVars.Code15019; - return Json(jm); + return jm; } if (promotion.maxNums > 0) @@ -165,12 +165,12 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (couponResult.status && couponResult.code >= promotion.maxNums) { jm.msg = GlobalErrorCodeVars.Code15018; - return Json(jm); + return jm; } } jm = await _couponServices.AddData(_user.ID, entity.id, promotion); jm.otherData = promotionModel; - return Json(jm); + return jm; } #endregion @@ -181,28 +181,28 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetCouponKey([FromBody] FMCouponForGetCouponKeyPost entity) + public async Task GetCouponKey([FromBody] FMCouponForGetCouponKeyPost entity) { var jm = new WebApiCallBack(); if (string.IsNullOrEmpty(entity.key)) { jm.msg = GlobalErrorCodeVars.Code15006; - return Json(jm); + return jm; } var coupon = await _couponServices.QueryByClauseAsync(p => p.couponCode == entity.key); if (coupon == null || coupon.promotionId <= 0) { jm.msg = GlobalErrorCodeVars.Code15009; - return Json(jm); + return jm; } //判断优惠券是否可以领取? var promotionModel = await _promotionServices.ReceiveCoupon(coupon.promotionId); if (promotionModel.status == false) { - return Json(promotionModel); + return promotionModel; } //判断用户是否已领取? if (promotionModel.data is CoreCmsPromotion { maxNums: > 0 } info) @@ -212,13 +212,13 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (couponResult.status && couponResult.code > info.maxNums) { jm.msg = GlobalErrorCodeVars.Code15018; - return Json(jm); + return jm; } } // jm = await _couponServices.ReceiveCoupon(_user.ID, entity.key); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.WebApi/Controllers/DemoController.cs b/CoreCms.Net.Web.WebApi/Controllers/DemoController.cs index a645bd8..88cefb8 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/DemoController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/DemoController.cs @@ -15,7 +15,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// 默认接口示例 /// - public class DemoController : Controller + public class DemoController : ControllerBase { /// /// 默认首页 diff --git a/CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs b/CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs index ed79fa1..bdf07cc 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs @@ -26,7 +26,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class DistributionController : Controller + public class DistributionController : ControllerBase { private readonly ICoreCmsDistributionOrderServices _distributionOrderServices; private readonly ICoreCmsDistributionServices _distributionServices; @@ -57,25 +57,25 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetStoreInfo([FromBody] FMIntId entity) + public async Task GetStoreInfo([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); if (entity.id == 0) { jm.msg = "店铺信息丢失"; - return Json(jm); + return jm; } var store = UserHelper.GetUserIdByShareCode(entity.id); if (store <= 0) { jm.msg = "店铺信息丢失"; - return Json(jm); + return jm; } jm = await _distributionServices.GetStore(store); - return Json(jm); + return jm; } #endregion @@ -90,10 +90,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task Info() + public async Task Info() { var jm = await _distributionServices.GetInfo(_user.ID, true); - return Json(jm); + return jm; } #endregion @@ -106,14 +106,14 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task ApplyDistribution([FromBody] FMDistributionApply entity) + public async Task ApplyDistribution([FromBody] FMDistributionApply entity) { var jm = new WebApiCallBack(); if (entity.agreement != "on") { jm.msg = "请勾选分销协议"; - return Json(jm); + return jm; } var iData = new CoreCmsDistribution(); @@ -123,7 +123,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers iData.qq = entity.qq; jm = await _distributionServices.AddData(iData, _user.ID); - return Json(jm); + return jm; } #endregion @@ -136,10 +136,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task MyOrder([FromBody] FMPageByIntId entity) + public async Task MyOrder([FromBody] FMPageByIntId entity) { var jm = await _distributionServices.GetMyOrderList(_user.ID, entity.page, entity.limit, entity.id); - return Json(jm); + return jm; } #endregion @@ -152,26 +152,26 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task SetStore([FromBody] FMSetDistributionStorePost entity) + public async Task SetStore([FromBody] FMSetDistributionStorePost entity) { var jm = new WebApiCallBack(); if (string.IsNullOrEmpty(entity.storeName)) { jm.msg = "请填写店铺名称"; - return Json(jm); + return jm; } if (string.IsNullOrEmpty(entity.storeLogo)) { jm.msg = "请上传店铺logo"; - return Json(jm); + return jm; } if (string.IsNullOrEmpty(entity.storeBanner)) { jm.msg = "请上传店铺banner"; - return Json(jm); + return jm; } var info = await _distributionServices.QueryByClauseAsync(p => p.userId == _user.ID); @@ -187,7 +187,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = true; jm.msg = "保存成功"; - return Json(jm); + return jm; } #endregion @@ -200,7 +200,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetOrderSum() + public async Task GetOrderSum() { var jm = new WebApiCallBack(); @@ -236,7 +236,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers monthOrderMoney }; - return Json(jm); + return jm; } #endregion @@ -249,7 +249,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetTeamSum() + public async Task GetTeamSum() { var jm = new WebApiCallBack(); @@ -274,7 +274,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers monthSecond }; - return Json(jm); + return jm; } #endregion @@ -287,7 +287,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetDistributionRanking([FromBody] FMPageByIntId entity) + public async Task GetDistributionRanking([FromBody] FMPageByIntId entity) { var jm = new WebApiCallBack(); @@ -305,7 +305,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers list.TotalCount }; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.WebApi/Controllers/FormController.cs b/CoreCms.Net.Web.WebApi/Controllers/FormController.cs index 891b5a4..e0a5d08 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/FormController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/FormController.cs @@ -28,7 +28,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class FormController : Controller + public class FormController : ControllerBase { private readonly ICoreCmsFormServices _formServices; @@ -49,10 +49,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetFormDetial([FromBody] FmGetForm entity) + public async Task GetFormDetial([FromBody] FmGetForm entity) { var jm = await _formServices.GetFormInfo(entity.id, entity.token); - return Json(jm); + return jm; } #endregion @@ -64,13 +64,13 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task AddSubmit([FromBody] FmAddSubmit entity) + public async Task AddSubmit([FromBody] FmAddSubmit entity) { var jm = await _formServices.AddSubmit(entity); jm.otherData = entity; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs b/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs index 89a22b5..55816c8 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs @@ -38,7 +38,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class GoodController : Controller + public class GoodController : ControllerBase { private IMapper _mapper; private readonly IHttpContextUser _user; @@ -94,7 +94,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetAllCategories() + public async Task GetAllCategories() { var jm = new WebApiCallBack() { status = true }; @@ -135,7 +135,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = true; jm.data = wxGoodCategoryDto; - return Json(jm); + return jm; } #endregion @@ -146,7 +146,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetGoodsPageList([FromBody] FMPageByWhereOrder entity) + public async Task GetGoodsPageList([FromBody] FMPageByWhereOrder entity) { var jm = new WebApiCallBack(); @@ -263,7 +263,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers }; jm.msg = "数据调用成功!"; - return Json(jm); + return jm; } #endregion @@ -274,7 +274,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetDetial([FromBody] FMIntId entity) + public async Task GetDetial([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); @@ -288,7 +288,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (model == null) { jm.msg = "商品获取失败"; - return Json(jm); + return jm; } jm.status = true; @@ -296,7 +296,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.data = model; jm.methodDescription = JsonConvert.SerializeObject(_user); - return Json(jm); + return jm; } #endregion @@ -307,7 +307,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetProductInfo([FromBody] FMGetProductInfo entity) + public async Task GetProductInfo([FromBody] FMGetProductInfo entity) { var jm = new WebApiCallBack(); @@ -323,14 +323,14 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (getProductInfo == null) { jm.msg = "获取单个货品失败"; - return Json(jm); + return jm; } jm.status = true; jm.msg = "获取单个货品成功"; jm.data = getProductInfo; - return Json(jm); + return jm; } #endregion @@ -342,7 +342,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetGoodsComment([FromBody] FMPageByIntId entity) + public async Task GetGoodsComment([FromBody] FMPageByIntId entity) { var jm = new WebApiCallBack(); @@ -366,7 +366,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers totalPages = list.TotalPages }; - return Json(jm); + return jm; } #endregion @@ -377,7 +377,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetGoodsParams([FromBody] FMIntId entity) + public async Task GetGoodsParams([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); @@ -386,7 +386,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (goods == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var list = new List(); var goodsParams = await _goodsParamsServices.QueryAsync(); @@ -418,7 +418,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.msg = "获取商品参数成功"; jm.data = list; - return Json(jm); + return jm; } #endregion @@ -428,7 +428,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetGoodsRecommendList([FromBody] FMIntId entity) + public async Task GetGoodsRecommendList([FromBody] FMIntId entity) { if (entity.id <= 0) { @@ -444,7 +444,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers msg = "获取成功", data = await _goodsServices.GetGoodsRecommendList(entity.id, bl) }; - return Json(jm); + return jm; } #endregion @@ -459,7 +459,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetDetialByToken([FromBody] FMIntId entity) + public async Task GetDetialByToken([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); @@ -473,7 +473,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (model == null) { jm.msg = "商品获取失败"; - return Json(jm); + return jm; } await _goodsServices.UpdateAsync(p => new CoreCmsGoods() { viewCount = p.viewCount + 1 }, @@ -485,7 +485,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.data = model; jm.methodDescription = JsonConvert.SerializeObject(_user); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.WebApi/Controllers/GroupController.cs b/CoreCms.Net.Web.WebApi/Controllers/GroupController.cs index b2bc6eb..cbeab97 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/GroupController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/GroupController.cs @@ -29,7 +29,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class GroupController : Controller + public class GroupController : ControllerBase { private readonly IHttpContextUser _user; @@ -56,11 +56,11 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetList([FromBody] FMGroupGetListPost entity) + public async Task GetList([FromBody] FMGroupGetListPost entity) { var jm = await _coreCmsPromotionServices.GetGroupList(entity.type, _user.ID, entity.status, entity.page, entity.limit); - return Json(jm); + return jm; } #endregion @@ -70,10 +70,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetGoodsDetial([FromBody] FMGetGoodsDetial entity) + public async Task GetGoodsDetial([FromBody] FMGetGoodsDetial entity) { var jm = await _coreCmsPromotionServices.GetGroupDetail(entity.id, 0, "group", entity.groupId); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.WebApi/Controllers/NoticeController.cs b/CoreCms.Net.Web.WebApi/Controllers/NoticeController.cs index 289cb1b..b33dbcb 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/NoticeController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/NoticeController.cs @@ -30,7 +30,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class NoticeController : Controller + public class NoticeController : ControllerBase { private IHttpContextUser _user; private ICoreCmsNoticeServices _noticeServices; @@ -53,7 +53,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task NoticeList([FromBody] FMPageByIntId entity) + public async Task NoticeList([FromBody] FMPageByIntId entity) { var jm = new WebApiCallBack(); @@ -62,7 +62,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = true; jm.data = list; - return Json(jm); + return jm; } diff --git a/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs b/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs index 7b939d9..baf2b86 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs @@ -33,7 +33,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class OrderController : Controller + public class OrderController : ControllerBase { private readonly IHttpContextUser _user; private readonly ICoreCmsOrderServices _orderServices; @@ -84,10 +84,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetTaxCode([FromBody] GetTaxCodePost entity) + public async Task GetTaxCode([FromBody] GetTaxCodePost entity) { var jm = await _orderServices.GetTaxCode(entity.name); - return Json(jm); + return jm; } #endregion @@ -98,7 +98,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task CreateOrder([FromBody] CreateOrder entity) + public async Task CreateOrder([FromBody] CreateOrder entity) { var jm = new WebApiCallBack(); @@ -149,7 +149,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers entity.taxCode, entity.teamId, entity.groupId); jm.otherData = entity; - return Json(jm); + return jm; } #endregion @@ -160,7 +160,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task OrderDetails([FromBody] FMStringId entity) + public async Task OrderDetails([FromBody] FMStringId entity) { var jm = new WebApiCallBack(); @@ -172,7 +172,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers { jm.status = false; jm.msg = "你不是店员"; - return Json(jm); + return jm; } else { @@ -180,7 +180,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers } } jm = await _orderServices.GetOrderInfoByOrderId(entity.id, userId); - return Json(jm); + return jm; } #endregion @@ -191,7 +191,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetOrderStatusNum([FromBody] GetOrderStatusNumPost entity) + public async Task GetOrderStatusNum([FromBody] GetOrderStatusNumPost entity) { var jm = new WebApiCallBack(); @@ -201,7 +201,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers } var ids = CommonHelper.StringToIntArray(entity.ids); jm = await _orderServices.GetOrderStatusNum(_user.ID, ids, entity.isAfterSale); - return Json(jm); + return jm; } #endregion @@ -214,10 +214,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetOrderList([FromBody] GetOrderListPost entity) + public async Task GetOrderList([FromBody] GetOrderListPost entity) { var jm = await _orderServices.GetOrderList(entity.status, _user.ID, entity.page, entity.limit); - return Json(jm); + return jm; } #endregion @@ -230,18 +230,18 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task CancelOrder([FromBody] FMStringId entity) + public async Task CancelOrder([FromBody] FMStringId entity) { var jm = new WebApiCallBack(); if (string.IsNullOrEmpty(entity.id)) { jm.msg = "请提交要取消的订单号"; - return Json(jm); + return jm; } var ids = entity.id.Split(","); jm = await _orderServices.CancelOrder(ids, _user.ID); - return Json(jm); + return jm; } #endregion @@ -254,19 +254,19 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task DeleteOrder([FromBody] FMStringId entity) + public async Task DeleteOrder([FromBody] FMStringId entity) { var jm = new WebApiCallBack(); if (string.IsNullOrEmpty(entity.id)) { jm.msg = "请提交要取消的订单号"; - return Json(jm); + return jm; } var ids = entity.id.Split(","); jm.status = await _orderServices.DeleteAsync(p => ids.Contains(p.orderId) && p.userId == _user.ID); jm.msg = jm.status ? "删除成功" : "删除失败"; - return Json(jm); + return jm; } #endregion @@ -278,17 +278,17 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task OrderConfirm([FromBody] FMStringId entity) + public async Task OrderConfirm([FromBody] FMStringId entity) { var jm = new WebApiCallBack(); if (string.IsNullOrEmpty(entity.id)) { jm.msg = "请提交要确认签收的订单号"; - return Json(jm); + return jm; } jm = await _orderServices.ConfirmOrder(entity.id, Convert.ToInt32(entity.data)); - return Json(jm); + return jm; } #endregion @@ -301,7 +301,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task AddAftersales([FromBody] ToAddBillAfterSalesPost entity) + public async Task AddAftersales([FromBody] ToAddBillAfterSalesPost entity) { var jm = new WebApiCallBack(); @@ -310,17 +310,17 @@ namespace CoreCms.Net.Web.WebApi.Controllers { jm.msg = GlobalErrorCodeVars.Code13100; jm.code = 13100; - return Json(jm); + return jm; } if (entity.type == 0) { jm.msg = GlobalErrorCodeVars.Code10051; jm.code = 10051; - return Json(jm); + return jm; } jm = await _aftersalesServices.ToAdd(_user.ID, entity.orderId, entity.type, entity.items, entity.images, entity.reason, entity.refund); - return Json(jm); + return jm; } @@ -334,7 +334,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task AftersalesList([FromBody] FMPageByStringId entity) + public async Task AftersalesList([FromBody] FMPageByStringId entity) { var jm = new WebApiCallBack(); @@ -357,7 +357,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers hasNextPage = data.HasNextPage }; - return Json(jm); + return jm; } @@ -371,7 +371,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task Aftersalesinfo([FromBody] FMStringId entity) + public async Task Aftersalesinfo([FromBody] FMStringId entity) { var jm = new WebApiCallBack { status = true, msg = "数据获取成功" }; @@ -405,7 +405,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers info, reship }; - return Json(jm); + return jm; } @@ -419,24 +419,24 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task SendReship([FromBody] FMBillReshipForSendReshipPost entity) + public async Task SendReship([FromBody] FMBillReshipForSendReshipPost entity) { var jm = new WebApiCallBack(); if (string.IsNullOrEmpty(entity.reshipId)) { jm.data = jm.msg = GlobalErrorCodeVars.Code13212; - return Json(jm); + return jm; } else if (string.IsNullOrEmpty(entity.logiCode)) { jm.data = jm.msg = GlobalErrorCodeVars.Code13213; - return Json(jm); + return jm; } else if (string.IsNullOrEmpty(entity.logiNo)) { jm.data = jm.msg = GlobalErrorCodeVars.Code13214; - return Json(jm); + return jm; } @@ -444,7 +444,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (model == null) { jm.data = jm.msg = GlobalErrorCodeVars.Code13211; - return Json(jm); + return jm; } var up = await _reshipServices.UpdateAsync( @@ -458,7 +458,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = true; jm.msg = "数据保存成功"; - return Json(jm); + return jm; } #endregion @@ -471,7 +471,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public JsonResult GetShip([FromBody] FMIntId entity) + public WebApiCallBack GetShip([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); @@ -484,7 +484,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.data = ship; jm.msg = "获取成功"; } - return Json(jm); + return jm; } @@ -498,14 +498,14 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task LogisticsByApi([FromBody] FMApiLogisticsByApiPost entity) + public async Task LogisticsByApi([FromBody] FMApiLogisticsByApiPost entity) { var jm = new WebApiCallBack(); if (string.IsNullOrEmpty(entity.code) || string.IsNullOrEmpty(entity.no)) { jm.msg = GlobalErrorCodeVars.Code13225; - return Json(jm); + return jm; } var systemLogistics = SystemSettingDictionary.GetSystemLogistics(); @@ -514,12 +514,12 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (entity.code == p.sKey) { jm.msg = p.sDescription + "不支持轨迹查询"; - return Json(jm); + return jm; } } jm = await _logisticsServices.ExpressPoll(entity.code, entity.no, entity.mobile); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.WebApi/Controllers/PageController.cs b/CoreCms.Net.Web.WebApi/Controllers/PageController.cs index ee8cac1..236e505 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/PageController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/PageController.cs @@ -35,7 +35,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class PageController : Controller + public class PageController : ControllerBase { private IMapper _mapper; private readonly ICoreCmsSettingServices _settingServices; @@ -70,10 +70,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Description("获取页面布局数据")] - public async Task GetPageConfig([FromBody] FMWxPost entity) + public async Task GetPageConfig([FromBody] FMWxPost entity) { var jm = await _pagesServices.GetPageConfig(entity.code); - return Json(jm); + return jm; } #endregion @@ -84,7 +84,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Description("获取用户购买记录")] - public async Task GetRecod([FromBody] FMGetRecodPost entity) + public async Task GetRecod([FromBody] FMGetRecodPost entity) { var jm = new WebApiCallBack() { status = true, msg = "获取成功", otherData = entity }; @@ -148,7 +148,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.data = listUsers[listI]; } } - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.WebApi/Controllers/PayNotify/AliPayController.cs b/CoreCms.Net.Web.WebApi/Controllers/PayNotify/AliPayController.cs index fabbd85..6006068 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/PayNotify/AliPayController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/PayNotify/AliPayController.cs @@ -23,7 +23,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers.PayNotify /// 支付宝异步通知 /// [Route("Notify/[controller]/[action]")] - public class AliPayController : Controller + public class AliPayController : ControllerBase { private readonly IAlipayNotifyClient _client; private readonly IOptions _optionsAccessor; diff --git a/CoreCms.Net.Web.WebApi/Controllers/PayNotify/WeChatPayController.cs b/CoreCms.Net.Web.WebApi/Controllers/PayNotify/WeChatPayController.cs index b7ea80d..c8fd7ff 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/PayNotify/WeChatPayController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/PayNotify/WeChatPayController.cs @@ -29,7 +29,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers.PayNotify /// 微信支付异步通知 /// [Route("Notify/[controller]/[action]")] - public class WeChatPayController : Controller + public class WeChatPayController : ControllerBase { private readonly ICoreCmsBillPaymentsServices _billPaymentsServices; private readonly ICoreCmsBillRefundServices _billRefundServices; diff --git a/CoreCms.Net.Web.WebApi/Controllers/PaymentsController.cs b/CoreCms.Net.Web.WebApi/Controllers/PaymentsController.cs index abb4d20..1499c08 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/PaymentsController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/PaymentsController.cs @@ -33,7 +33,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class PaymentsController : Controller + public class PaymentsController : ControllerBase { private IHttpContextUser _user; @@ -64,14 +64,14 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetList() + public async Task GetList() { var jm = new WebApiCallBack(); var list = await _paymentsServices.QueryListByClauseAsync(p => p.isEnable == true, p => p.sort, OrderByType.Asc); jm.status = true; jm.data = list; - return Json(jm); + return jm; } #endregion @@ -85,18 +85,18 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task CheckPay([FromBody] CheckPayPost entity) + public async Task CheckPay([FromBody] CheckPayPost entity) { var jm = new WebApiCallBack(); if (string.IsNullOrEmpty(entity.ids)) { jm.msg = GlobalErrorCodeVars.Code13100; - return Json(jm); + return jm; } jm = await _billPaymentsServices.FormatPaymentRel(entity.ids, entity.paymentType, entity.@params); - return Json(jm); + return jm; } #endregion @@ -109,17 +109,17 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetInfo([FromBody] FMStringId entity) + public async Task GetInfo([FromBody] FMStringId entity) { var jm = new WebApiCallBack(); if (string.IsNullOrEmpty(entity.id)) { jm.msg = GlobalErrorCodeVars.Code13100; - return Json(jm); + return jm; } var userId = entity.data.ObjectToInt(0); jm = await _billPaymentsServices.GetInfo(entity.id, userId); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.WebApi/Controllers/PinTuanController.cs b/CoreCms.Net.Web.WebApi/Controllers/PinTuanController.cs index dfc2270..05d66f6 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/PinTuanController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/PinTuanController.cs @@ -31,7 +31,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class PinTuanController : Controller + public class PinTuanController : ControllerBase { private readonly IHttpContextUser _user; @@ -66,7 +66,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetList([FromBody] FMIntId entity) + public async Task GetList([FromBody] FMIntId entity) { WebApiCallBack jm; @@ -81,7 +81,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers id = entity.id; } jm = await _pinTuanRuleServices.GetPinTuanList(id, userId); - return Json(jm); + return jm; } @@ -93,7 +93,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetGoodsInfo([FromBody] FMIntId entity) + public async Task GetGoodsInfo([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); @@ -108,7 +108,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.msg = "获取详情成功"; jm.data = await _pinTuanGoodsServices.GetGoodsInfo(entity.id, userId, pinTuanStatus); - return Json(jm); + return jm; } @@ -120,7 +120,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetProductInfo([FromBody] FMGetProductInfo entity) + public async Task GetProductInfo([FromBody] FMGetProductInfo entity) { var jm = new WebApiCallBack(); @@ -128,7 +128,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (products == null) { jm.msg = GlobalErrorCodeVars.Code10000; - return Json(jm); + return jm; } //把拼团的一些属性等加上 var info = await _pinTuanRuleServices.QueryMuchFirstAsync( @@ -138,12 +138,12 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (info == null) { jm.msg = GlobalErrorCodeVars.Code10000; - return Json(jm); + return jm; } products.pinTuanRule = info; jm.status = true; jm.data = products; - return Json(jm); + return jm; } @@ -155,18 +155,18 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetPinTuanTeam([FromBody] FMGetPinTuanTeamPost entity) + public async Task GetPinTuanTeam([FromBody] FMGetPinTuanTeamPost entity) { var jm = new WebApiCallBack(); if (string.IsNullOrEmpty(entity.orderId) && entity.teamId == 0) { jm.msg = GlobalErrorCodeVars.Code15606; - return Json(jm); + return jm; } jm = await _pinTuanRecordServices.GetTeamList(entity.teamId, entity.orderId); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.WebApi/Controllers/ServiceController.cs b/CoreCms.Net.Web.WebApi/Controllers/ServiceController.cs index 2589c2c..422911e 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/ServiceController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/ServiceController.cs @@ -34,7 +34,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class ServiceController : Controller + public class ServiceController : ControllerBase { private readonly ICoreCmsServicesServices _servicesServices; private readonly ICoreCmsUserServicesOrderServices _userServicesOrderServices; @@ -81,7 +81,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] //[Authorize] - public async Task GetPageList([FromBody] FMPageByIntId entity) + public async Task GetPageList([FromBody] FMPageByIntId entity) { var jm = new WebApiCallBack(); @@ -134,7 +134,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers list = list, count = list.TotalCount, }; - return Json(jm); + return jm; } @@ -147,7 +147,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] //[Authorize] - public async Task GetDetails([FromBody] FMIntId entity) + public async Task GetDetails([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); @@ -184,7 +184,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = true; jm.data = data; - return Json(jm); + return jm; } @@ -199,7 +199,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task AddServiceOrder([FromBody] FMIntId entity) + public async Task AddServiceOrder([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); @@ -208,20 +208,20 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (data == null) { jm.msg = "服务数据获取失败"; - return Json(jm); + return jm; } var user = await _userServices.QueryByIdAsync(_user.ID); if (user == null) { jm.msg = "用户数据获取失败"; - return Json(jm); + return jm; } if (!data.allowedMembership.Contains("," + user.grade + ",")) { jm.msg = "您所在的用户级别不支持购买"; - return Json(jm); + return jm; } var order = new CoreCmsUserServicesOrder(); @@ -236,7 +236,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = bl; jm.data = order.serviceOrderId; - return Json(jm); + return jm; } @@ -251,10 +251,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task VerificationPageList([FromBody] FMPageByIntId entity) + public async Task VerificationPageList([FromBody] FMPageByIntId entity) { var jm = await _ticketVerificationLogServices.GetVerificationLogs(_user.ID, entity.page, entity.limit); - return Json(jm); + return jm; } #endregion @@ -265,10 +265,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task LogDelete([FromBody] FMIntId entity) + public async Task LogDelete([FromBody] FMIntId entity) { var jm = await _ticketVerificationLogServices.LogDelete(entity.id, _user.ID); - return Json(jm); + return jm; } #endregion @@ -280,21 +280,21 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetTicketInfo([FromBody] FMStringId entity) + public async Task GetTicketInfo([FromBody] FMStringId entity) { var jm = new WebApiCallBack(); if (string.IsNullOrEmpty(entity.id)) { jm.msg = "请提交查询数据关键词"; - return Json(jm); + return jm; } var ticket = await _userServicesTicketServices.QueryByClauseAsync(p => p.redeemCode == entity.id); if (ticket == null) { jm.msg = "未查询到服务券"; - return Json(jm); + return jm; } ticket.statusStr = EnumHelper.GetEnumDescriptionByValue(ticket.status); @@ -311,7 +311,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers serviceOrder }; - return Json(jm); + return jm; } #endregion @@ -322,53 +322,53 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task VerificationTicket([FromBody] FMStringId entity) + public async Task VerificationTicket([FromBody] FMStringId entity) { var jm = new WebApiCallBack(); if (string.IsNullOrEmpty(entity.id)) { jm.msg = "请提交查询数据关键词"; - return Json(jm); + return jm; } var ticket = await _userServicesTicketServices.QueryByClauseAsync(p => p.redeemCode == entity.id); if (ticket == null) { jm.msg = "未查询到服务券"; - return Json(jm); + return jm; } if (ticket.status != (int)GlobalEnumVars.ServicesTicketStatus.Normal) { jm.msg = "服务券状态不支持核销"; - return Json(jm); + return jm; } var service = await _servicesServices.QueryByIdAsync(ticket.serviceId); if (service == null) { jm.msg = "服务项目获取失败"; - return Json(jm); + return jm; } var user = await _userServices.QueryByIdAsync(_user.ID); if (user == null) { jm.msg = "未获取到审核权限"; - return Json(jm); + return jm; } var clerk = await _clerkServices.QueryByClauseAsync(p => p.userId == user.id); if (clerk == null) { jm.msg = "非门店店员无权限核验"; - return Json(jm); + return jm; } if (!service.consumableStore.Contains("," + clerk.storeId + ",")) { jm.msg = "您所在的门店无权核销此券"; - return Json(jm); + return jm; } //开始更新数据 @@ -395,7 +395,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = up && bl; jm.msg = jm.status ? "核销成功" : "核销失败"; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.WebApi/Controllers/StoreController.cs b/CoreCms.Net.Web.WebApi/Controllers/StoreController.cs index 1abca45..b3f6710 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/StoreController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/StoreController.cs @@ -35,7 +35,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class StoreController : Controller + public class StoreController : ControllerBase { private readonly IHttpContextUser _user; private readonly ICoreCmsStoreServices _storeServices; @@ -70,7 +70,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetDefaultStore() + public async Task GetDefaultStore() { var jm = new WebApiCallBack(); @@ -78,7 +78,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = true; jm.data = ship; - return Json(jm); + return jm; } #endregion @@ -88,7 +88,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetStoreList([FromBody] FMGetStoreQueryPageByCoordinate entity) + public async Task GetStoreList([FromBody] FMGetStoreQueryPageByCoordinate entity) { var jm = new WebApiCallBack(); try @@ -135,7 +135,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.msg = GlobalConstVars.DataHandleEx; jm.data = e.ToString(); } - return Json(jm); + return jm; } #endregion @@ -145,7 +145,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetRecommendKeys() + public async Task GetRecommendKeys() { var jm = new WebApiCallBack(); @@ -155,7 +155,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.msg = "获取成功"; jm.data = !string.IsNullOrEmpty(recommendKeysStr) ? recommendKeysStr.Split("|") : new string[] { }; - return Json(jm); + return jm; } #endregion @@ -165,13 +165,13 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetStoreSwitch() + public async Task GetStoreSwitch() { var jm = new WebApiCallBack { status = true, msg = "获取成功" }; var allConfigs = await _settingServices.GetConfigDictionaries(); jm.data = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.StoreSwitch).ObjectToInt(2); ; - return Json(jm); + return jm; } #endregion @@ -181,7 +181,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetStoreById([FromBody] FMIntId entity) + public async Task GetStoreById([FromBody] FMIntId entity) { var jm = new WebApiCallBack { @@ -189,7 +189,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers msg = "获取成功", data = await _storeServices.QueryByClauseAsync(p => p.id == entity.id) }; - return Json(jm); + return jm; } #endregion @@ -202,10 +202,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task IsClerk() + public async Task IsClerk() { var jm = await _clerkServices.IsClerk(_user.ID); - return Json(jm); + return jm; } #endregion @@ -216,7 +216,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetStoreByUserId() + public async Task GetStoreByUserId() { var jm = new WebApiCallBack { @@ -224,7 +224,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers msg = "获取成功", data = await _storeServices.GetStoreByUserId(_user.ID) }; - return Json(jm); + return jm; } #endregion @@ -236,7 +236,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetOrderPageByMerchant([FromBody] GetOrderPageByMerchantPost entity) + public async Task GetOrderPageByMerchant([FromBody] GetOrderPageByMerchantPost entity) { var jm = new WebApiCallBack(); @@ -251,7 +251,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.msg = "你不是店员"; } - return Json(jm); + return jm; } #endregion @@ -263,10 +263,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task StoreLadingList([FromBody] FMPageByIntId entity) + public async Task StoreLadingList([FromBody] FMPageByIntId entity) { var jm = await _billLadingServices.GetStoreLadingList(_user.ID, entity.page, entity.limit); - return Json(jm); + return jm; } #endregion @@ -277,10 +277,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task LadingDelete([FromBody] FMStringId entity) + public async Task LadingDelete([FromBody] FMStringId entity) { var jm = await _billLadingServices.LadingDelete(entity.id, _user.ID); - return Json(jm); + return jm; } #endregion @@ -291,18 +291,18 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task LadingInfo([FromBody] FMStringId entity) + public async Task LadingInfo([FromBody] FMStringId entity) { var jm = new WebApiCallBack(); if (string.IsNullOrEmpty(entity.id)) { jm.msg = "请提交查询数据关键词"; - return Json(jm); + return jm; } jm = await _billLadingServices.GetInfo(entity.id, _user.ID); - return Json(jm); + return jm; } #endregion @@ -313,21 +313,21 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task Lading([FromBody] FMStringId entity) + public async Task Lading([FromBody] FMStringId entity) { var jm = new WebApiCallBack(); if (string.IsNullOrEmpty(entity.id)) { jm.msg = "请提交查询数据关键词"; - return Json(jm); + return jm; } var array = entity.id.Split(","); var result = await _billLadingServices.LadingOperating(array, _user.ID); jm.status = result.code == 0; jm.msg = result.msg; - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs index 5a372e9..5ba4324 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs @@ -51,7 +51,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class UserController : Controller + public class UserController : ControllerBase { private readonly ICoreCmsUserWeChatInfoServices _userWeChatInfoServices; @@ -163,7 +163,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task OnLogin([FromBody] FMWxPost entity) + public async Task OnLogin([FromBody] FMWxPost entity) { var jm = new WebApiCallBack(); @@ -230,12 +230,12 @@ namespace CoreCms.Net.Web.WebApi.Controllers log.parameters = GlobalEnumVars.UserLogTypes.登录.ToString(); await _userLogServices.InsertAsync(log); - return Json(jm); + return jm; } } //注意：生产环境下SessionKey属于敏感信息，不能进行传输！ - //return Json(new { success = true, msg = "OK", sessionAuthId = sessionBag.Key, sessionKey = sessionBag.SessionKey, data = jsonResult, sessionBag = sessionBag }); + //return new JsonResult(new { success = true, msg = "OK", sessionAuthId = sessionBag.Key, sessionKey = sessionBag.SessionKey, data = jsonResult, sessionBag = sessionBag }); jm.status = true; jm.data = response.OpenId; jm.otherData = response.OpenId; @@ -247,7 +247,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.msg = response.ErrorMessage; } - return Json(jm); + return jm; } #endregion @@ -258,7 +258,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task DecodeEncryptedData([FromBody] FMWxLoginDecodeEncryptedData entity) + public async Task DecodeEncryptedData([FromBody] FMWxLoginDecodeEncryptedData entity) { var jm = new WebApiCallBack(); @@ -324,7 +324,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers await _userWeChatInfoServices.UpdateAsync(p => new CoreCmsUserWeChatInfo() { mobile = user.mobile }, p => p.id == userInfo.id); } - return Json(jm); + return jm; } } } @@ -334,7 +334,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers token, sessionAuthId = userWxId }; - return Json(jm); + return jm; } #endregion @@ -345,13 +345,13 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task SendSms([FromBody] FMWxSendSMS entity) + public async Task SendSms([FromBody] FMWxSendSMS entity) { var jm = new WebApiCallBack(); if (!CommonHelper.IsMobile(entity.mobile)) { jm.msg = "请输入合法的手机号码"; - return Json(jm); + return jm; } if (entity.code == "login") { @@ -359,11 +359,11 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (shave) { jm.msg = "手机号码已被绑定,请更换"; - return Json(jm); + return jm; } } jm = await _smsServices.DoSendSms(entity.code, entity.mobile); - return Json(jm); + return jm; } #endregion @@ -374,10 +374,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task SmsLogin([FromBody] FMWxAccountCreate entity) + public async Task SmsLogin([FromBody] FMWxAccountCreate entity) { var jm = await _userServices.SmsLogin(entity, 2, entity.platform); - return Json(jm); + return jm; } #endregion @@ -390,7 +390,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task DecryptPhoneNumber([FromBody] FMWxLoginDecryptPhoneNumber entity) + public async Task DecryptPhoneNumber([FromBody] FMWxLoginDecryptPhoneNumber entity) { var jm = new WebApiCallBack(); @@ -410,7 +410,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = false; jm.code = 500; NLogUtil.WriteAll(LogLevel.Error, LogType.Web, "小程序接口", "微信小程序授权拉取手机号码", ex); - return Json(jm); + return jm; } var data = new FMWxAccountCreate @@ -422,7 +422,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm = await _userServices.SmsLogin(data, (int)GlobalEnumVars.LoginType.WeChatPhoneNumber, 1); - return Json(jm); + return jm; } @@ -436,20 +436,20 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Obsolete] [HttpPost] - public async Task SmsLogin2([FromBody] FMWxAccountCreate entity) + public async Task SmsLogin2([FromBody] FMWxAccountCreate entity) { var jm = new WebApiCallBack(); if (!CommonHelper.IsMobile(entity.mobile)) { jm.msg = "请输入合法的手机号码"; - return Json(jm); + return jm; } var user = await _userServices.QueryByClauseAsync(p => p.mobile == entity.mobile); if (user != null) { jm.msg = "此号码已经绑定,请更换"; - return Json(jm); + return jm; } var wxUserInfo = new CoreCmsUserWeChatInfo(); //1就是h5登陆（h5端和微信公众号端），2就是微信小程序登陆，3是支付宝小程序，4是app，5是pc @@ -458,7 +458,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (string.IsNullOrEmpty(entity.sessionAuthId)) { jm.msg = "用户未正确登陆"; - return Json(jm); + return jm; } wxUserInfo = await _userWeChatInfoServices.QueryByClauseAsync(p => p.openid == entity.sessionAuthId); } @@ -466,19 +466,19 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (sms == null) { jm.msg = "验证码核验失败"; - return Json(jm); + return jm; } if (sms.isUsed) { jm.msg = "验证码已被使用"; - return Json(jm); + return jm; } var dt = DateTime.Now; var endDt = sms.createTime.AddMinutes(10); if (dt > endDt) { jm.msg = "验证码已过期，请重新获取"; - return Json(jm); + return jm; } user = new CoreCmsUser(); user.mobile = entity.mobile; @@ -536,7 +536,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.msg = "注册失败"; } - return Json(jm); + return jm; } #endregion @@ -548,11 +548,11 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task GetAreaId([FromBody] GetAreaIdPost entity) + public async Task GetAreaId([FromBody] GetAreaIdPost entity) { var jm = await _areaServices.GetAreaId(entity.provinceName, entity.cityName, entity.countyName, entity.postalCode); - return Json(jm); + return jm; } #endregion @@ -562,7 +562,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public JsonResult LogOut() + public WebApiCallBack LogOut() { var jm = new WebApiCallBack { @@ -573,7 +573,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers } }; - return Json(jm); + return jm; } #endregion @@ -583,14 +583,14 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public async Task IsPoint() + public async Task IsPoint() { var jm = new WebApiCallBack { status = true, msg = "获取成功" }; var allConfigs = await _settingServices.GetConfigDictionaries(); jm.data = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.PointSwitch).ObjectToInt(2); ; - return Json(jm); + return jm; } #endregion @@ -619,7 +619,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// array [HttpPost] - public async Task Share([FromBody] FMShare entity) + public async Task Share([FromBody] FMShare entity) { var jm = new WebApiCallBack(); @@ -641,7 +641,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm = await _shareServices.PosterShare(entity.client, entity.page, userShareCode, entity.url, entity.@params); } - return Json(jm); + return jm; } #endregion @@ -653,7 +653,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// /// [HttpPost] - public JsonResult DeShare([FromBody] FMDeShare entity) + public WebApiCallBack DeShare([FromBody] FMDeShare entity) { var jm = new WebApiCallBack(); @@ -663,7 +663,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers } jm = _shareServices.de_url(entity.code); - return Json(jm); + return jm; } #endregion @@ -678,7 +678,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Authorize] [HttpPost] - public async Task SyncWeChatInfo([FromBody] FMWxSync entity) + public async Task SyncWeChatInfo([FromBody] FMWxSync entity) { var jm = new WebApiCallBack(); @@ -720,7 +720,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = true; jm.data = user; - return Json(jm); + return jm; } #endregion @@ -732,7 +732,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetUserInfo() + public async Task GetUserInfo() { var jm = new WebApiCallBack() { status = true }; var user = await _userServices.QueryByIdAsync(_user.ID); @@ -741,7 +741,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = false; jm.msg = "用户信息获取失败"; jm.code = 14007; - return Json(jm); + return jm; } //获取用户等级 var userGrade = await _userGradeServices.QueryByClauseAsync(p => p.id == user.grade); @@ -778,7 +778,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers footPrintCount, collectionCount }; - return Json(jm); + return jm; } #endregion @@ -789,7 +789,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetCartNumber() + public async Task GetCartNumber() { var jm = new WebApiCallBack(); @@ -798,7 +798,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.msg = jm.status ? GlobalConstVars.GetDataSuccess : GlobalConstVars.GetDataFailure; jm.data = count; - return Json(jm); + return jm; } #endregion @@ -809,7 +809,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GoodsCollectionCreateOrDelete([FromBody] FMIntId entity) + public async Task GoodsCollectionCreateOrDelete([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); @@ -820,7 +820,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (goods == null) { jm.msg = GlobalErrorCodeVars.Code17001; - return Json(jm); + return jm; } collection = new CoreCmsGoodsCollection() @@ -840,7 +840,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers } jm.status = true; - return Json(jm); + return jm; } @@ -853,7 +853,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetUserDefaultShip() + public async Task GetUserDefaultShip() { var jm = new WebApiCallBack(); @@ -871,7 +871,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = true; jm.data = ship; - return Json(jm); + return jm; } #endregion @@ -882,7 +882,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task SetDefShip([FromBody] FMIntId entity) + public async Task SetDefShip([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); @@ -900,7 +900,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.msg = "该地址不存在"; } - return Json(jm); + return jm; } #endregion @@ -912,7 +912,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetUserPoint([FromBody] GetUserPointPost entity) + public async Task GetUserPoint([FromBody] GetUserPointPost entity) { var jm = new WebApiCallBack(); @@ -920,7 +920,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = true; jm.data = ship; - return Json(jm); + return jm; } #endregion @@ -931,7 +931,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetUserShip() + public async Task GetUserShip() { var jm = new WebApiCallBack(); @@ -950,7 +950,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = true; jm.data = ship; - return Json(jm); + return jm; } #endregion @@ -962,7 +962,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task SaveUserShip([FromBody] SaveUserShipPost entity) + public async Task SaveUserShip([FromBody] SaveUserShipPost entity) { var jm = new WebApiCallBack(); @@ -1008,7 +1008,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.msg = "地址保存成功"; } - return Json(jm); + return jm; } #endregion @@ -1020,7 +1020,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetShipDetail([FromBody] FMIntId entity) + public async Task GetShipDetail([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); @@ -1037,7 +1037,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = true; jm.data = ship; - return Json(jm); + return jm; } #endregion @@ -1048,7 +1048,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task RemoveShip([FromBody] FMIntId entity) + public async Task RemoveShip([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); @@ -1064,7 +1064,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers await _userShipServices.UpdateAsync(p => new CoreCmsUserShip() { isDefault = true }, p => p.userId == _user.ID); } } - return Json(jm); + return jm; } #endregion @@ -1076,7 +1076,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task Pay([FromBody] PayPost entity) + public async Task Pay([FromBody] PayPost entity) { var jm = new WebApiCallBack(); @@ -1099,7 +1099,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm = await _billPaymentsServices.Pay(entity.ids, entity.payment_code, _user.ID, entity.payment_type, entity.@params); - return Json(jm); + return jm; } #endregion @@ -1112,7 +1112,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task OrderEvaluate([FromBody] OrderEvaluatePost entity) + public async Task OrderEvaluate([FromBody] OrderEvaluatePost entity) { var jm = new WebApiCallBack(); @@ -1128,7 +1128,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers } jm = await _goodsCommentServices.AddComment(entity.orderId, entity.items, _user.ID); jm.otherData = entity; - return Json(jm); + return jm; } #endregion @@ -1140,10 +1140,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetMyBankcardsList() + public async Task GetMyBankcardsList() { var jm = await _userBankCardServices.GetMyBankcardsList(_user.ID); - return Json(jm); + return jm; } #endregion @@ -1155,13 +1155,13 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task AddBankCards([FromBody] CoreCmsUserBankCard entity) + public async Task AddBankCards([FromBody] CoreCmsUserBankCard entity) { var jm = new WebApiCallBack(); entity.userId = _user.ID; jm = await _userBankCardServices.AddBankCards(entity); - return Json(jm); + return jm; } @@ -1174,18 +1174,18 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task SetDefaultBankCard([FromBody] FMIntId entity) + public async Task SetDefaultBankCard([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); if (entity.id == 0) { jm.msg = GlobalErrorCodeVars.Code10051; - return Json(jm); + return jm; } jm = await _userBankCardServices.SetDefault(_user.ID, entity.id); - return Json(jm); + return jm; } @@ -1198,18 +1198,18 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetBankCardInfo([FromBody] FMIntId entity) + public async Task GetBankCardInfo([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); if (entity.id == 0) { jm.msg = GlobalErrorCodeVars.Code10051; - return Json(jm); + return jm; } jm = await _userBankCardServices.GetBankcardInfo(_user.ID, entity.id); - return Json(jm); + return jm; } @@ -1222,10 +1222,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetDefaultBankCard() + public async Task GetDefaultBankCard() { var jm = await _userBankCardServices.GetDefaultBankCard(_user.ID); - return Json(jm); + return jm; } @@ -1238,10 +1238,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task Removebankcard([FromBody] FMIntId entity) + public async Task Removebankcard([FromBody] FMIntId entity) { var jm = await _userBankCardServices.Removebankcard(entity.id, _user.ID); - return Json(jm); + return jm; } #endregion @@ -1253,10 +1253,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public JsonResult GetBankCardsOrganization([FromBody] FMStringId entity) + public WebApiCallBack GetBankCardsOrganization([FromBody] FMStringId entity) { var jm = _userBankCardServices.BankCardsOrganization(entity.id); - return Json(jm); + return jm; } #endregion @@ -1268,13 +1268,13 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task Cash([FromBody] FMIntId entity) + public async Task Cash([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); var money = entity.data.ObjectToDecimal(0); jm = await _userTocashServices.Tocash(_user.ID, money, entity.id); - return Json(jm); + return jm; } #endregion @@ -1286,12 +1286,12 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task CashList([FromBody] FMPageByIntId entity) + public async Task CashList([FromBody] FMPageByIntId entity) { var jm = new WebApiCallBack(); jm = await _userTocashServices.UserToCashList(_user.ID, entity.page, entity.limit, entity.id); - return Json(jm); + return jm; } @@ -1304,7 +1304,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task UserBalance([FromBody] FMGetBalancePost entity) + public async Task UserBalance([FromBody] FMGetBalancePost entity) { var jm = new WebApiCallBack(); @@ -1357,7 +1357,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers data.TotalPages, sunMoney }; - return Json(jm); + return jm; } @@ -1370,7 +1370,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task UserInvoiceList([FromBody] FMPageByIntId entity) + public async Task UserInvoiceList([FromBody] FMPageByIntId entity) { var jm = new WebApiCallBack(); @@ -1404,7 +1404,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers data.TotalCount, data.TotalPages }; - return Json(jm); + return jm; } @@ -1417,7 +1417,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task UserPointLog([FromBody] FMPageByIntId entity) + public async Task UserPointLog([FromBody] FMPageByIntId entity) { var jm = new WebApiCallBack(); @@ -1439,7 +1439,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers data.TotalCount, data.TotalPages }; - return Json(jm); + return jm; } @@ -1452,7 +1452,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GoodsCollectionList([FromBody] FMPageByIntId entity) + public async Task GoodsCollectionList([FromBody] FMPageByIntId entity) { var jm = new WebApiCallBack(); @@ -1465,7 +1465,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers count = data.TotalCount, }; - return Json(jm); + return jm; } @@ -1478,12 +1478,12 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GoodsCollection([FromBody] FMIntId entity) + public async Task GoodsCollection([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); jm = await _goodsCollectionServices.ToAdd(_user.ID, entity.id); - return Json(jm); + return jm; } @@ -1496,7 +1496,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task Goodsbrowsing([FromBody] FMPageByIntId entity) + public async Task Goodsbrowsing([FromBody] FMPageByIntId entity) { var jm = new WebApiCallBack(); @@ -1509,7 +1509,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers count = data.TotalCount, }; - return Json(jm); + return jm; } @@ -1522,7 +1522,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task AddGoodsBrowsing([FromBody] FMIntId entity) + public async Task AddGoodsBrowsing([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); @@ -1532,7 +1532,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (goods == null) { jm.msg = GlobalConstVars.DataisNo; - return Json(jm); + return jm; } var goodsBrowsing = new CoreCmsGoodsBrowsing { @@ -1545,7 +1545,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = await _goodsBrowsingServices.InsertAsync(goodsBrowsing) > 0; jm.msg = jm.status ? GlobalConstVars.InsertSuccess : GlobalConstVars.InsertFailure; - return Json(jm); + return jm; } @@ -1558,14 +1558,14 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task DelGoodsBrowsing([FromBody] FMIntId entity) + public async Task DelGoodsBrowsing([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); jm.status = await _goodsBrowsingServices.DeleteAsync(p => p.userId == _user.ID && p.goodsId == entity.id); jm.msg = jm.status ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - return Json(jm); + return jm; } #endregion @@ -1576,14 +1576,14 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task ChangeAvatar([FromBody] FMStringId entity) + public async Task ChangeAvatar([FromBody] FMStringId entity) { var jm = new WebApiCallBack(); if (string.IsNullOrEmpty(entity.id)) { jm.data = GlobalErrorCodeVars.Code11003; - return Json(jm); + return jm; } var up = await _userServices.UpdateAsync(p => new CoreCmsUser() { avatarImage = entity.id }, @@ -1593,7 +1593,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.msg = jm.status ? "设置头像成功" : "设置头像失败"; jm.data = entity.id; - return Json(jm); + return jm; } #endregion @@ -1604,26 +1604,26 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task EditInfo([FromBody] EditInfoPost entity) + public async Task EditInfo([FromBody] EditInfoPost entity) { var jm = new WebApiCallBack(); if (entity.birthday == null) { jm.msg = GlobalErrorCodeVars.Code11027; - return Json(jm); + return jm; } if (string.IsNullOrEmpty(entity.nickname)) { jm.msg = GlobalErrorCodeVars.Code11028; - return Json(jm); + return jm; } if (entity.sex <= 0) { jm.msg = GlobalErrorCodeVars.Code11029; - return Json(jm); + return jm; } var up = await _userServices.UpdateAsync(p => new CoreCmsUser() { birthday = entity.birthday, nickName = entity.nickname, sex = entity.sex }, @@ -1632,7 +1632,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers jm.status = up; jm.msg = jm.status ? "资料保存成功" : "资料保存失败"; - return Json(jm); + return jm; } @@ -1645,28 +1645,28 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task EditPwd([FromBody] EditPwdPost entity) + public async Task EditPwd([FromBody] EditPwdPost entity) { var jm = new WebApiCallBack(); if (string.IsNullOrEmpty(entity.repwd)) { jm.msg = GlobalErrorCodeVars.Code11014; - return Json(jm); + return jm; } if (string.IsNullOrEmpty(entity.newpwd)) { jm.msg = GlobalErrorCodeVars.Code11013; - return Json(jm); + return jm; } if (entity.repwd != entity.newpwd) { jm.msg = GlobalErrorCodeVars.Code11025; - return Json(jm); + return jm; } jm = await _userServices.ChangePassword(_user.ID, entity.newpwd, entity.pwd); - return Json(jm); + return jm; } #endregion @@ -1677,7 +1677,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task MyInvite() + public async Task MyInvite() { var jm = new WebApiCallBack(); @@ -1700,7 +1700,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers money, isSuperior }; - return Json(jm); + return jm; } #endregion @@ -1712,19 +1712,19 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task SetMyInvite([FromBody] FMIntId entity) + public async Task SetMyInvite([FromBody] FMIntId entity) { var jm = new WebApiCallBack(); if (entity.id == 0) { jm.msg = "请输入推荐人邀请码！"; - return Json(jm); + return jm; } var code = UserHelper.GetUserIdByShareCode(entity.id); jm = await _userServices.SetMyInvite(code, _user.ID); - return Json(jm); + return jm; } #endregion @@ -1737,14 +1737,14 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetMyInvite() + public async Task GetMyInvite() { var jm = await _userServices.GetMyInvite(_user.ID); var first = await _userServices.QueryChildCountAsync(_user.ID, 1); var second = await _userServices.QueryChildCountAsync(_user.ID, 2); - return Json(jm); + return jm; } #endregion @@ -1758,7 +1758,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetMyChildSum() + public async Task GetMyChildSum() { var jm = new WebApiCallBack(); @@ -1780,7 +1780,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers monthSecond }; - return Json(jm); + return jm; } #endregion @@ -1794,7 +1794,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task Recommend([FromBody] FMPageByIntId entity) + public async Task Recommend([FromBody] FMPageByIntId entity) { var jm = new WebApiCallBack(); @@ -1818,7 +1818,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers data.TotalPages }; - return Json(jm); + return jm; } #endregion @@ -1830,14 +1830,14 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public JsonResult ShareCode() + public WebApiCallBack ShareCode() { var jm = new WebApiCallBack(); jm.status = true; jm.data = UserHelper.GetShareCodeByUserId(_user.ID); - return Json(jm); + return jm; } #endregion @@ -1849,10 +1849,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task IsSign() + public async Task IsSign() { var jm = await _userPointLogServices.IsSign(_user.ID); - return Json(jm); + return jm; } #endregion @@ -1863,10 +1863,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task Sign() + public async Task Sign() { var jm = await _userPointLogServices.Sign(_user.ID); - return Json(jm); + return jm; } #endregion @@ -1877,37 +1877,37 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task ForgetPwd([FromBody] FMForgetPwdPost entity) + public async Task ForgetPwd([FromBody] FMForgetPwdPost entity) { var jm = new WebApiCallBack(); if (string.IsNullOrEmpty(entity.mobile)) { jm.msg = GlobalErrorCodeVars.Code10051; - return Json(jm); + return jm; } if (string.IsNullOrEmpty(entity.code)) { jm.msg = GlobalErrorCodeVars.Code10013; - return Json(jm); + return jm; } if (string.IsNullOrEmpty(entity.newpwd)) { jm.msg = GlobalErrorCodeVars.Code11013; - return Json(jm); + return jm; } if (string.IsNullOrEmpty(entity.repwd)) { jm.msg = GlobalErrorCodeVars.Code11014; - return Json(jm); + return jm; } if (entity.newpwd != entity.repwd) { jm.msg = GlobalErrorCodeVars.Code11025; - return Json(jm); + return jm; } jm = await _userServices.ForgetPassword(entity.mobile, entity.code, entity.newpwd); - return Json(jm); + return jm; } #endregion @@ -1918,7 +1918,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetServicesPageList([FromBody] FMPageByIntId entity) + public async Task GetServicesPageList([FromBody] FMPageByIntId entity) { var jm = new WebApiCallBack(); @@ -1946,7 +1946,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers list = orders, count = orders.TotalCount, }; - return Json(jm); + return jm; } @@ -1959,7 +1959,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task GetServicesTickets([FromBody] FMPageByStringId entity) + public async Task GetServicesTickets([FromBody] FMPageByStringId entity) { var jm = new WebApiCallBack(); @@ -1968,7 +1968,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers if (order == null) { jm.msg = "订单信息获取失败"; - return Json(jm); + return jm; } var model = await _servicesServices.QueryByClauseAsync(p => p.id == order.servicesId); if (model != null) @@ -2016,7 +2016,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers list = orders, count = orders.TotalCount, }; - return Json(jm); + return jm; } diff --git a/CoreCms.Net.Web.WebApi/Controllers/WeChatAppletsMessageController.cs b/CoreCms.Net.Web.WebApi/Controllers/WeChatAppletsMessageController.cs index 271060f..ef6e7c4 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/WeChatAppletsMessageController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/WeChatAppletsMessageController.cs @@ -29,7 +29,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [Route("api/[controller]/[action]")] [ApiController] - public class WeChatAppletsMessageController : Controller + public class WeChatAppletsMessageController : ControllerBase { private readonly IHttpContextUser _user; private readonly ICoreCmsUserWeChatMsgTemplateServices _userWeChatMsgTemplateServices; @@ -54,10 +54,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task IsTip() + public async Task IsTip() { var jm = await _userWeChatMsgSubscriptionSwitchServices.IsTip(_user.ID); - return Json(jm); + return jm; } #endregion @@ -68,10 +68,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task CloseTip() + public async Task CloseTip() { var jm = await _userWeChatMsgSubscriptionSwitchServices.CloseTip(_user.ID); - return Json(jm); + return jm; } #endregion @@ -83,11 +83,11 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task Tmpl() + public async Task Tmpl() { var jm = await _userWeChatMsgSubscriptionServices.tmpl(_user.ID); - return Json(jm); + return jm; } #endregion @@ -99,10 +99,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers /// [HttpPost] [Authorize] - public async Task SetTip([FromBody] SetWeChatAppletsMessageTip entity) + public async Task SetTip([FromBody] SetWeChatAppletsMessageTip entity) { var jm = await _userWeChatMsgSubscriptionServices.SetTip(_user.ID, entity.templateId, entity.status); - return Json(jm); + return jm; } #endregion diff --git a/CoreCms.Net.Web.WebApi/Controllers/WeChatOAuth/WxOpenController.cs b/CoreCms.Net.Web.WebApi/Controllers/WeChatOAuth/WxOpenController.cs index 4d93cd1..b5b51f6 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/WeChatOAuth/WxOpenController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/WeChatOAuth/WxOpenController.cs @@ -39,7 +39,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers.WeChatOAuth /// /// 微信小程序Controller /// - public class WxOpenController : Controller + public class WxOpenController : ControllerBase { private readonly WeChat.Service.HttpClients.IWeChatApiHttpClientFactory _weChatApiHttpClientFactory;