diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/Controllers/Controller.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/Controllers/Controller.tpl
index acc2635215ffd212a6e103156d862f7ed865df2f..36cd062956d8e60c05376cfb18a5a9506cd87d2b 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.Filter/AdminsControllerPermission.cs b/CoreCms.Net.Filter/AdminsControllerPermission.cs
index c22458db31d6042e35ae9719173df2f40a7f6c45..34810d85f7637ee3fcb86b430d539d6bd7303918 100644
--- a/CoreCms.Net.Filter/AdminsControllerPermission.cs
+++ b/CoreCms.Net.Filter/AdminsControllerPermission.cs
@@ -37,7 +37,7 @@ namespace CoreCms.Net.Filter
var controllers = types.Where(p => p.Name.Contains("Controller") && !noController.Contains(p.Name));
foreach (var type in controllers)
{
- if (type.Name.Length > 10 && type.BaseType.Name == "Controller" && type.Name.EndsWith("Controller")) //如果是Controller
+ if (type.Name.Length > 10 && type.BaseType.Name == "ControllerBase" && type.Name.EndsWith("Controller")) //如果是Controller
{
var members = type.GetMethods();
var cp = new ControllerPermission
@@ -56,12 +56,18 @@ namespace CoreCms.Net.Filter
var newMembers = members.Where(p =>
- p.ReturnType.Name == "ActionResult" || p.ReturnType.Name == "FileResult" ||
- p.ReturnType.Name == "JsonResult" || (p.ReturnType.GenericTypeArguments.Length > 0 && p.ReturnType.GenericTypeArguments[0].Name == "JsonResult")).ToList();
+ p.ReturnType.FullName != null && (p.ReturnType.Name == "ActionResult" ||
+ p.ReturnType.Name == "FileResult" ||
+ p.ReturnType.Name == "JsonResult" ||
+ (p.ReturnType.GenericTypeArguments.Length > 0 && p.ReturnType.GenericTypeArguments[0].Name == "JsonResult") ||
+ p.ReturnType.Name == "AdminUiCallBack" ||
+ p.ReturnType.Name == "IActionResult" ||
+ p.ReturnType.FullName.Contains("CoreCms.Net.Model.ViewModels.UI.AdminUiCallBack"))
+ ).ToList();
foreach (var member in newMembers)
{
- if (member.Name == "ValidationProblem" || member.Name =="Json") continue;
+ if (member.Name == "ValidationProblem" || member.Name == "Json") continue;
//if (member.ReturnType.Name == "ActionResult" || member.ReturnType.Name == "FileResult" || member.ReturnType.Name == "JsonResult" || (member.ReturnType.GenericTypeArguments.Length > 0 && member.ReturnType.GenericTypeArguments[0].Name == "JsonResult")) //如果是Action
//{
diff --git a/CoreCms.Net.Repository/Shop/CoreCmsStoreRepository.cs b/CoreCms.Net.Repository/Shop/CoreCmsStoreRepository.cs
index 6032a0e6bcedb130d3050eb90082a6c281d0dd37..febaa6c7de6059103203f362813332ded40c47cf 100644
--- a/CoreCms.Net.Repository/Shop/CoreCmsStoreRepository.cs
+++ b/CoreCms.Net.Repository/Shop/CoreCmsStoreRepository.cs
@@ -146,38 +146,57 @@ namespace CoreCms.Net.Repository
RefAsync totalCount = 0;
//MySql与SqlServer查询语句相同
- var sql = string.Empty;
+ List page;
if (latitude > 0 && longitude > 0)
{
var sqrt = "SQRT(power(SIN((" + latitude + "*PI()/180-(CoreCmsStore.latitude)*PI()/180)/2),2)+COS(" + latitude + "*PI()/180)*COS((CoreCmsStore.latitude)*PI()/180)*power(SIN((" + longitude + "*PI()/180-(CoreCmsStore.longitude)*PI()/180)/2),2))";
- sql = "SELECT id, storeName, mobile, linkMan, logoImage, areaId, address, coordinate, latitude, longitude, isDefault, createTime, updateTime, ROUND(6378.138*2*ASIN(" + sqrt + ")*1000,2) AS distance FROM CoreCmsStore";
+ var sql = "SELECT id, storeName, mobile, linkMan, logoImage, areaId, address, coordinate, latitude, longitude, isDefault, createTime, updateTime, ROUND(6378.138*2*ASIN(" + sqrt + ")*1000,2) AS distance FROM CoreCmsStore";
+
+ page = await DbClient.SqlQueryable(sql)
+ .WhereIF(predicate != null, predicate)
+ .OrderByIF(orderByExpression != null, orderByExpression, orderByType)
+ .Select(p => new CoreCmsStore
+ {
+ id = p.id,
+ storeName = p.storeName,
+ mobile = p.mobile,
+ linkMan = p.linkMan,
+ logoImage = p.logoImage,
+ areaId = p.areaId,
+ address = p.address,
+ coordinate = p.coordinate,
+ latitude = p.latitude,
+ longitude = p.longitude,
+ isDefault = p.isDefault,
+ createTime = p.createTime,
+ updateTime = p.updateTime,
+ distance = Convert.ToDecimal(p.distance)
+ }).ToPageListAsync(pageIndex, pageSize, totalCount);
}
else
{
- sql = "SELECT id, storeName, mobile, linkMan, logoImage, areaId, address, coordinate, latitude, longitude, isDefault, createTime, updateTime, distance FROM CoreCmsStore";
+ page = await DbClient.Queryable()
+ .WhereIF(predicate != null, predicate)
+ .OrderByIF(orderByExpression != null, orderByExpression, orderByType)
+ .Select(p => new CoreCmsStore
+ {
+ id = p.id,
+ storeName = p.storeName,
+ mobile = p.mobile,
+ linkMan = p.linkMan,
+ logoImage = p.logoImage,
+ areaId = p.areaId,
+ address = p.address,
+ coordinate = p.coordinate,
+ latitude = p.latitude,
+ longitude = p.longitude,
+ isDefault = p.isDefault,
+ createTime = p.createTime,
+ updateTime = p.updateTime,
+ distance = Convert.ToDecimal(p.distance)
+ }).ToPageListAsync(pageIndex, pageSize, totalCount);
}
- var page = await DbClient.SqlQueryable(sql)
- .WhereIF(predicate != null, predicate)
- .OrderByIF(orderByExpression != null, orderByExpression, orderByType)
- .Select(p => new CoreCmsStore
- {
- id = p.id,
- storeName = p.storeName,
- mobile = p.mobile,
- linkMan = p.linkMan,
- logoImage = p.logoImage,
- areaId = p.areaId,
- address = p.address,
- coordinate = p.coordinate,
- latitude = p.latitude,
- longitude = p.longitude,
- isDefault = p.isDefault,
- createTime = p.createTime,
- updateTime = p.updateTime,
- distance = Convert.ToDecimal(p.distance)
- }).ToPageListAsync(pageIndex, pageSize, totalCount);
-
var list = new PageList(page, pageIndex, pageSize, totalCount);
return list;
}
diff --git a/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertPositionController.cs b/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertPositionController.cs
index cd11f93452a9db266b4bfc8536c4f5fc6fd5a061..0ae67e0ea850727373cb1d7d8f5517fc1ac3611f 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 6bbcffc9cb49ad45e32d34d097280c2d57350528..80ef1ab3c6425cf7afe07ce5daede010083cbcf3 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 86cbf84a848f141c840cf15b6451c2198b9ff303..db049e6cf151ec6b2e2b27984c43fdff4dc1ba1f 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 c397440d441ae762cb2cfd5c6b5fbf01c6c6bec8..c740ee29d095fca4374ccbf4553ca879b4cde89d 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 8ca913899405b67465970bc1b32f3bd06a1db87e..9ec81166a140b701b71247ec8195033acc4f707b 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 962d907505562fff39134cb4d79c325f980663c8..23f861afdcbb8618ceefae2daa2e12f91d9b8f64 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 ee76d1732d2e3ce98a2396325a5153053518f5a9..ffff7028a088b245d1553391520666ec6176c6e0 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 525c443dd935ac328ed420b3066af36fe43b7d16..b1510cec4bf0ca93392abe126576434553361dac 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 e5910dd088e22070e3beeeb868df1fb885a84bff..1bee497b08a1f751f3fdee9b66706abf50a76e05 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 ded07db0b2fd22fec950148c146a4f5149ceb82f..0000000000000000000000000000000000000000
--- 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 94747729c7d19f69fccba76c61a1aec022689af3..177c70953ea1b90418a44be47623f15929fc2a2c 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