服务层响应实体 优化

master
xiaochanghai 1 year ago
parent d7a3d9f768
commit f49ec845c2
  1. 32
      Tiobon.Core.Api/Controllers/BaseApiController.cs
  2. 32
      Tiobon.Core.Api/Controllers/BaseController.cs
  3. 22
      Tiobon.Core.Api/Controllers/BlogController.cs
  4. 20
      Tiobon.Core.Api/Controllers/DbFirst/DbFirstController.cs
  5. 12
      Tiobon.Core.Api/Controllers/DbFirst/MigrateController.cs
  6. 28
      Tiobon.Core.Api/Controllers/DepartmentController.cs
  7. 24
      Tiobon.Core.Api/Controllers/Ghra_GradeController.cs
  8. 2
      Tiobon.Core.Api/Controllers/ImgController.cs
  9. 14
      Tiobon.Core.Api/Controllers/LoginController.cs
  10. 14
      Tiobon.Core.Api/Controllers/ModuleController.cs
  11. 22
      Tiobon.Core.Api/Controllers/MonitorController.cs
  12. 16
      Tiobon.Core.Api/Controllers/NacosController.cs
  13. 12
      Tiobon.Core.Api/Controllers/PayController.cs
  14. 46
      Tiobon.Core.Api/Controllers/PermissionController.cs
  15. 14
      Tiobon.Core.Api/Controllers/RoleController.cs
  16. 24
      Tiobon.Core.Api/Controllers/SplitDemoController.cs
  17. 11
      Tiobon.Core.Api/Controllers/Systems/CacheManageController.cs
  18. 11
      Tiobon.Core.Api/Controllers/Systems/DataBaseController.cs
  19. 7
      Tiobon.Core.Api/Controllers/Systems/DynamicCodeFirstController.cs
  20. 52
      Tiobon.Core.Api/Controllers/TasksQzController.cs
  21. 5
      Tiobon.Core.Api/Controllers/Tenant/TenantByDbController.cs
  22. 4
      Tiobon.Core.Api/Controllers/Tenant/TenantByIdController.cs
  23. 5
      Tiobon.Core.Api/Controllers/Tenant/TenantByTableController.cs
  24. 14
      Tiobon.Core.Api/Controllers/Tenant/TenantManagerController.cs
  25. 4
      Tiobon.Core.Api/Controllers/TopicController.cs
  26. 20
      Tiobon.Core.Api/Controllers/TopicDetailController.cs
  27. 6
      Tiobon.Core.Api/Controllers/TransactionController.cs
  28. 18
      Tiobon.Core.Api/Controllers/UserController.cs
  29. 12
      Tiobon.Core.Api/Controllers/UserRoleController.cs
  30. 14
      Tiobon.Core.Api/Controllers/ValuesController.cs
  31. 24
      Tiobon.Core.Api/Controllers/WeChatCompanyController.cs
  32. 24
      Tiobon.Core.Api/Controllers/WeChatConfigController.cs
  33. 26
      Tiobon.Core.Api/Controllers/WeChatController.cs
  34. 24
      Tiobon.Core.Api/Controllers/WeChatPushLogController.cs
  35. 24
      Tiobon.Core.Api/Controllers/WeChatSubController.cs
  36. 9
      Tiobon.Core.Api/Filter/GlobalActionFilter.cs
  37. 4
      Tiobon.Core.Api/Filter/GlobalExceptionFilter.cs
  38. 213
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  39. 62
      Tiobon.Core.Common/Attribute/FromFilterAttribute.cs
  40. 2
      Tiobon.Core.Common/HttpContextUser/AspNetUser.cs
  41. 2
      Tiobon.Core.Common/HttpContextUser/IUser.cs
  42. 18
      Tiobon.Core.Common/Seed/FrameSeed.cs
  43. 4
      Tiobon.Core.Gateway/Controllers/UserController.cs
  44. 2
      Tiobon.Core.IServices/IGuestbookServices.cs
  45. 6
      Tiobon.Core.IServices/IPayServices.cs
  46. 24
      Tiobon.Core.IServices/IWeChatConfigServices.cs
  47. 4
      Tiobon.Core.Model/ApiResponse.cs
  48. 130
      Tiobon.Core.Model/MessageModel.cs
  49. 133
      Tiobon.Core.Model/ServiceResult.cs
  50. 6
      Tiobon.Core.Services/GuestbookServices.cs
  51. 18
      Tiobon.Core.Services/PayServices.cs
  52. 92
      Tiobon.Core.Services/WeChatConfigServices.cs
  53. 14
      Tiobon.Core.Tasks/QuartzNet/ISchedulerCenter.cs
  54. 28
      Tiobon.Core.Tasks/QuartzNet/SchedulerCenterServer.cs
  55. 10
      Tiobon.Core.Tests/Controller_Test/BlogController_Should.cs

@ -1,17 +1,19 @@
namespace Tiobon.Core.Controllers
using Tiobon.Core.Model;
namespace Tiobon.Core.Controllers
{
public class BaseApiController : Controller
{
[NonAction]
public MessageModel<T> Success<T>(T data, string msg = "成功")
public ServiceResult<T> Success<T>(T data, string msg = "成功")
{
return new MessageModel<T>() { success = true, msg = msg, response = data, };
return new ServiceResult<T>() { success = true, msg = msg, response = data, };
}
// [NonAction]
//public MessageModel<T> Success<T>(T data, string msg = "成功",bool success = true)
//public ServiceResult<T> Success<T>(T data, string msg = "成功",bool success = true)
//{
// return new MessageModel<T>()
// return new ServiceResult<T>()
// {
// success = success,
// msg = msg,
@ -19,33 +21,33 @@
// };
//}
[NonAction]
public MessageModel Success(string msg = "成功")
public ServiceResult Success(string msg = "成功")
{
return new MessageModel() { success = true, msg = msg, response = null, };
return new ServiceResult() { success = true, msg = msg, response = null, };
}
[NonAction]
public MessageModel<string> Failed(string msg = "失败", int status = 500)
public ServiceResult<string> Failed(string msg = "失败", int status = 500)
{
return new MessageModel<string>() { success = false, status = status, msg = msg, response = null, };
return new ServiceResult<string>() { success = false, status = status, msg = msg, response = null, };
}
[NonAction]
public MessageModel<T> Failed<T>(string msg = "失败", int status = 500)
public ServiceResult<T> Failed<T>(string msg = "失败", int status = 500)
{
return new MessageModel<T>() { success = false, status = status, msg = msg, response = default, };
return new ServiceResult<T>() { success = false, status = status, msg = msg, response = default, };
}
[NonAction]
public MessageModel<PageModel<T>> SuccessPage<T>(int page, int dataCount, int pageSize, List<T> data, int pageCount, string msg = "获取成功")
public ServiceResult<PageModel<T>> SuccessPage<T>(int page, int dataCount, int pageSize, List<T> data, int pageCount, string msg = "获取成功")
{
return new MessageModel<PageModel<T>>() { success = true, msg = msg, response = new PageModel<T>(page, dataCount, pageSize, data) };
return new ServiceResult<PageModel<T>>() { success = true, msg = msg, response = new PageModel<T>(page, dataCount, pageSize, data) };
}
[NonAction]
public MessageModel<PageModel<T>> SuccessPage<T>(PageModel<T> pageModel, string msg = "获取成功")
public ServiceResult<PageModel<T>> SuccessPage<T>(PageModel<T> pageModel, string msg = "获取成功")
{
return new MessageModel<PageModel<T>>() { success = true, msg = msg, response = pageModel };
return new ServiceResult<PageModel<T>>() { success = true, msg = msg, response = pageModel };
}
}
}

@ -1,4 +1,6 @@
namespace Tiobon.Core.Controllers
using Tiobon.Core.Model;
namespace Tiobon.Core.Controllers
{
public class BaseController<IServiceBase> : Controller
{
@ -14,15 +16,15 @@
#endregion
[NonAction]
public MessageModel<T> Success<T>(T data, string msg = "成功")
public ServiceResult<T> Success<T>(T data, string msg = "成功")
{
return new MessageModel<T>() { success = true, msg = msg, response = data, };
return new ServiceResult<T>() { success = true, msg = msg, response = data, };
}
// [NonAction]
//public MessageModel<T> Success<T>(T data, string msg = "成功",bool success = true)
//public ServiceResult<T> Success<T>(T data, string msg = "成功",bool success = true)
//{
// return new MessageModel<T>()
// return new ServiceResult<T>()
// {
// success = success,
// msg = msg,
@ -30,33 +32,33 @@
// };
//}
[NonAction]
public MessageModel Success(string msg = "成功")
public ServiceResult Success(string msg = "成功")
{
return new MessageModel() { success = true, msg = msg, response = null, };
return new ServiceResult() { success = true, msg = msg, response = null, };
}
[NonAction]
public MessageModel<string> Failed(string msg = "失败", int status = 500)
public ServiceResult<string> Failed(string msg = "失败", int status = 500)
{
return new MessageModel<string>() { success = false, status = status, msg = msg, response = null, };
return new ServiceResult<string>() { success = false, status = status, msg = msg, response = null, };
}
[NonAction]
public MessageModel<T> Failed<T>(string msg = "失败", int status = 500)
public ServiceResult<T> Failed<T>(string msg = "失败", int status = 500)
{
return new MessageModel<T>() { success = false, status = status, msg = msg, response = default, };
return new ServiceResult<T>() { success = false, status = status, msg = msg, response = default, };
}
[NonAction]
public MessageModel<PageModel<T>> SuccessPage<T>(int page, int dataCount, int pageSize, List<T> data, int pageCount, string msg = "获取成功")
public ServiceResult<PageModel<T>> SuccessPage<T>(int page, int dataCount, int pageSize, List<T> data, int pageCount, string msg = "获取成功")
{
return new MessageModel<PageModel<T>>() { success = true, msg = msg, response = new PageModel<T>(page, dataCount, pageSize, data) };
return new ServiceResult<PageModel<T>>() { success = true, msg = msg, response = new PageModel<T>(page, dataCount, pageSize, data) };
}
[NonAction]
public MessageModel<PageModel<T>> SuccessPage<T>(PageModel<T> pageModel, string msg = "获取成功")
public ServiceResult<PageModel<T>> SuccessPage<T>(PageModel<T> pageModel, string msg = "获取成功")
{
return new MessageModel<PageModel<T>>() { success = true, msg = msg, response = pageModel };
return new ServiceResult<PageModel<T>>() { success = true, msg = msg, response = pageModel };
}
}
}

@ -34,7 +34,7 @@ namespace Tiobon.Core.Controllers
/// <param name="key"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<PageModel<TiobonArticle>>> Get(int id, int page = 1, string bcategory = "技术博文", string key = "")
public async Task<ServiceResult<PageModel<TiobonArticle>>> Get(int id, int page = 1, string bcategory = "技术博文", string key = "")
{
int intPageSize = 6;
if (string.IsNullOrEmpty(key) || string.IsNullOrWhiteSpace(key))
@ -74,7 +74,7 @@ namespace Tiobon.Core.Controllers
[HttpGet("{id}")]
//[Authorize(Policy = "Scope_TiobonModule_Policy")]
[Authorize]
public async Task<MessageModel<TiobonViewModels>> Get(long id)
public async Task<ServiceResult<TiobonViewModels>> Get(long id)
{
return Success(await _TiobonArticleServices.GetTiobonDetails(id));
}
@ -87,7 +87,7 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
[HttpGet]
[Route("DetailNuxtNoPer")]
public async Task<MessageModel<TiobonViewModels>> DetailNuxtNoPer(long id)
public async Task<ServiceResult<TiobonViewModels>> DetailNuxtNoPer(long id)
{
_logger.LogInformation("xxxxxxxxxxxxxxxxxxx");
Log.Information("yyyyyyyyyyyyyyyyy");
@ -116,7 +116,7 @@ namespace Tiobon.Core.Controllers
[HttpGet]
[Route("GetTiobonsByTypesForMVP")]
public async Task<MessageModel<List<TiobonArticle>>> GetTiobonsByTypesForMVP(string types = "", int id = 0)
public async Task<ServiceResult<List<TiobonArticle>>> GetTiobonsByTypesForMVP(string types = "", int id = 0)
{
if (types.IsNotEmptyOrNull())
{
@ -128,7 +128,7 @@ namespace Tiobon.Core.Controllers
[HttpGet]
[Route("GetTiobonByIdForMVP")]
public async Task<MessageModel<TiobonArticle>> GetTiobonByIdForMVP(long id = 0)
public async Task<ServiceResult<TiobonArticle>> GetTiobonByIdForMVP(long id = 0)
{
if (id > 0)
{
@ -149,7 +149,7 @@ namespace Tiobon.Core.Controllers
//和上边的版本控制以及路由地址都是一样的
[CustomRoute(ApiVersions.V2, "Tiobontest")]
public MessageModel<string> V2_Tiobontest()
public ServiceResult<string> V2_Tiobontest()
{
return Success<string>("我是第二版的博客信息");
}
@ -162,7 +162,7 @@ namespace Tiobon.Core.Controllers
[HttpPost]
//[Authorize(Policy = "Scope_TiobonModule_Policy")]
[Authorize]
public async Task<MessageModel<string>> Post([FromBody] TiobonArticle TiobonArticle)
public async Task<ServiceResult<string>> Post([FromBody] TiobonArticle TiobonArticle)
{
if (TiobonArticle.btitle.Length > 5 && TiobonArticle.bcontent.Length > 50)
{
@ -189,7 +189,7 @@ namespace Tiobon.Core.Controllers
[HttpPost]
[Route("AddForMVP")]
[Authorize(Permissions.Name)]
public async Task<MessageModel<string>> AddForMVP([FromBody] TiobonArticle TiobonArticle)
public async Task<ServiceResult<string>> AddForMVP([FromBody] TiobonArticle TiobonArticle)
{
TiobonArticle.bCreateTime = DateTime.Now;
TiobonArticle.bUpdateTime = DateTime.Now;
@ -206,7 +206,7 @@ namespace Tiobon.Core.Controllers
[HttpPut]
[Route("Update")]
[Authorize(Permissions.Name)]
public async Task<MessageModel<string>> Put([FromBody] TiobonArticle TiobonArticle)
public async Task<ServiceResult<string>> Put([FromBody] TiobonArticle TiobonArticle)
{
if (TiobonArticle != null && TiobonArticle.bID > 0)
{
@ -239,7 +239,7 @@ namespace Tiobon.Core.Controllers
[HttpDelete]
[Authorize(Permissions.Name)]
[Route("Delete")]
public async Task<MessageModel<string>> Delete(long id)
public async Task<ServiceResult<string>> Delete(long id)
{
if (id > 0)
{
@ -260,7 +260,7 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
[HttpGet]
[Route("ApacheTestUpdate")]
public async Task<MessageModel<bool>> ApacheTestUpdate()
public async Task<ServiceResult<bool>> ApacheTestUpdate()
{
return Success(await _TiobonArticleServices.Update(new { bsubmitter = $"laozhang{DateTime.Now.Millisecond}", bID = 1 }), "更新成功");
}

@ -26,9 +26,9 @@ namespace Tiobon.Core.Controllers
/// </summary>
/// <returns></returns>
[HttpGet]
public MessageModel<string> GetFrameFiles()
public ServiceResult<string> GetFrameFiles()
{
var data = new MessageModel<string>() { success = true, msg = "" };
var data = new ServiceResult<string>() { success = true, msg = "" };
data.response += @"file path is:C:\my-file\}";
var isMuti = BaseDBConfig.IsMulti;
if (Env.IsDevelopment())
@ -64,12 +64,12 @@ namespace Tiobon.Core.Controllers
/// <param name="tableNames">需要生成的表名</param>
/// <returns></returns>
[HttpPost]
public MessageModel<string> GetFrameFilesByTableNames([FromBody] string[] tableNames, [FromQuery] string ConnID = null)
public ServiceResult<string> GetFrameFilesByTableNames([FromBody] string[] tableNames, [FromQuery] string ConnID = null)
{
ConnID = ConnID == null ? MainDb.CurrentDbConnId.ToLower() : ConnID;
var isMuti = BaseDBConfig.IsMulti;
var data = new MessageModel<string>() { success = true, msg = "" };
var data = new ServiceResult<string>() { success = true, msg = "" };
if (Env.IsDevelopment())
{
data.response += $"库{ConnID}-IRepositorys层生成:{FrameSeed.CreateIRepositorys(_sqlSugarClient, ConnID, isMuti, tableNames)} || ";
@ -92,12 +92,12 @@ namespace Tiobon.Core.Controllers
/// <param name="tableNames">需要生成的表名</param>
/// <returns></returns>
[HttpPost]
public MessageModel<string> GetFrameFilesByTableNamesForEntity([FromBody] string[] tableNames, [FromQuery] string ConnID = null)
public ServiceResult<string> GetFrameFilesByTableNamesForEntity([FromBody] string[] tableNames, [FromQuery] string ConnID = null)
{
ConnID = ConnID == null ? MainDb.CurrentDbConnId.ToLower() : ConnID;
var isMuti = BaseDBConfig.IsMulti;
var data = new MessageModel<string>() { success = true, msg = "" };
var data = new ServiceResult<string>() { success = true, msg = "" };
if (Env.IsDevelopment())
{
data.response += $"库{ConnID}-Models层生成:{FrameSeed.CreateModels(_sqlSugarClient, ConnID, isMuti, tableNames)}";
@ -116,12 +116,12 @@ namespace Tiobon.Core.Controllers
/// <param name="tableNames">需要生成的表名</param>
/// <returns></returns>
[HttpPost]
public MessageModel<string> GetFrameFilesByTableNamesForController([FromBody] string[] tableNames, [FromQuery] string ConnID = null)
public ServiceResult<string> GetFrameFilesByTableNamesForController([FromBody] string[] tableNames, [FromQuery] string ConnID = null)
{
ConnID = ConnID == null ? MainDb.CurrentDbConnId.ToLower() : ConnID;
var isMuti = BaseDBConfig.IsMulti;
var data = new MessageModel<string>() { success = true, msg = "" };
var data = new ServiceResult<string>() { success = true, msg = "" };
if (Env.IsDevelopment())
{
data.response += $"库{ConnID}-Controllers层生成:{FrameSeed.CreateControllers(_sqlSugarClient, ConnID, isMuti, tableNames)}";
@ -141,14 +141,14 @@ namespace Tiobon.Core.Controllers
/// <param name="tableName">需要生成的表名</param>
/// <returns></returns>
[HttpPost]
public MessageModel<string> GetAllFrameFilesByTableNames([FromQuery] string tableName, [FromQuery] string ConnID = null)
public ServiceResult<string> GetAllFrameFilesByTableNames([FromQuery] string tableName, [FromQuery] string ConnID = null)
{
string[] tableNames = new string[1];
tableNames[0] = tableName;
ConnID = ConnID == null ? MainDb.CurrentDbConnId.ToLower() : ConnID;
var isMuti = BaseDBConfig.IsMulti;
var data = new MessageModel<string>() { success = true, msg = "" };
var data = new ServiceResult<string>() { success = true, msg = "" };
if (Env.IsDevelopment())
{
_sqlSugarClient.ChangeDatabase(ConnID.ToLower());

@ -46,9 +46,9 @@ namespace Tiobon.Core.Controllers
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<string>> DataMigrateFromOld2New()
public async Task<ServiceResult<string>> DataMigrateFromOld2New()
{
var data = new MessageModel<string>() { success = true, msg = "" };
var data = new ServiceResult<string>() { success = true, msg = "" };
var filterPermissionId = 122;
if (_env.IsDevelopment())
{
@ -147,9 +147,9 @@ namespace Tiobon.Core.Controllers
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<string>> SaveData2TsvAsync()
public async Task<ServiceResult<string>> SaveData2TsvAsync()
{
var data = new MessageModel<string>() { success = true, msg = "" };
var data = new ServiceResult<string>() { success = true, msg = "" };
if (_env.IsDevelopment())
{
@ -203,9 +203,9 @@ namespace Tiobon.Core.Controllers
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<string>> SaveData2ExcelAsync()
public async Task<ServiceResult<string>> SaveData2ExcelAsync()
{
var data = new MessageModel<string>() { success = true, msg = "" };
var data = new ServiceResult<string>() { success = true, msg = "" };
if (_env.IsDevelopment())
{

@ -15,7 +15,7 @@
}
[HttpGet]
public async Task<MessageModel<PageModel<Department>>> Get(int page = 1, string key = "", int intPageSize = 50)
public async Task<ServiceResult<PageModel<Department>>> Get(int page = 1, string key = "", int intPageSize = 50)
{
if (string.IsNullOrEmpty(key) || string.IsNullOrWhiteSpace(key))
{
@ -24,7 +24,7 @@
Expression<Func<Department, bool>> whereExpression = a => true;
return new MessageModel<PageModel<Department>>()
return new ServiceResult<PageModel<Department>>()
{
msg = "获取成功",
success = true,
@ -34,9 +34,9 @@
}
[HttpGet("{id}")]
public async Task<MessageModel<Department>> Get(string id)
public async Task<ServiceResult<Department>> Get(string id)
{
return new MessageModel<Department>()
return new ServiceResult<Department>()
{
msg = "获取成功",
success = true,
@ -52,7 +52,7 @@
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<MessageModel<List<Department>>> GetTreeTable(long f = 0, string key = "")
public async Task<ServiceResult<List<Department>>> GetTreeTable(long f = 0, string key = "")
{
List<Department> departments = new List<Department>();
var departmentList = await _departmentServices.Query(d => d.IsDeleted == false);
@ -98,7 +98,7 @@
/// <param name="pid"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<DepartmentTree>> GetDepartmentTree(long pid = 0)
public async Task<ServiceResult<DepartmentTree>> GetDepartmentTree(long pid = 0)
{
var departments = await _departmentServices.Query(d => d.IsDeleted == false);
var departmentTrees = (from child in departments
@ -127,9 +127,9 @@
}
[HttpPost]
public async Task<MessageModel<string>> Post([FromBody] Department request)
public async Task<ServiceResult<string>> Post([FromBody] Department request)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
var id = await _departmentServices.Add(request);
data.success = id > 0;
@ -143,9 +143,9 @@
}
[HttpPut]
public async Task<MessageModel<string>> Put([FromBody] Department request)
public async Task<ServiceResult<string>> Put([FromBody] Department request)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
data.success = await _departmentServices.Update(request);
if (data.success)
{
@ -157,9 +157,9 @@
}
[HttpDelete]
public async Task<MessageModel<string>> Delete(long id)
public async Task<ServiceResult<string>> Delete(long id)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
var model = await _departmentServices.QueryById(id);
model.IsDeleted = true;
data.success = await _departmentServices.Update(model);
@ -175,9 +175,9 @@
[HttpGet]
[AllowAnonymous]
public async Task<MessageModel<string>> SaveData2Tsv()
public async Task<ServiceResult<string>> SaveData2Tsv()
{
var data = new MessageModel<string>() { success = true, msg = "" };
var data = new ServiceResult<string>() { success = true, msg = "" };
if (_env.IsDevelopment())
{

@ -21,10 +21,10 @@
/// <param name="filter">条件</param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<PageModel<Ghra_GradeDto>>> Get([FromFilter] QueryFilter filter)
public async Task<ServiceResult<PageModel<Ghra_GradeDto>>> Get([FromFilter] QueryFilter filter)
{
var response = await _service.QueryFilterPage(filter);
return new MessageModel<PageModel<Ghra_GradeDto>>() { msg = "获取成功", success = true, response = response };
return new ServiceResult<PageModel<Ghra_GradeDto>>() { msg = "获取成功", success = true, response = response };
}
/// <summary>
@ -33,13 +33,13 @@
/// <param name="Id">主键ID</param>
/// <returns></returns>
[HttpGet("{Id}")]
public async Task<MessageModel<Ghra_GradeDto>> Get(string Id)
public async Task<ServiceResult<Ghra_GradeDto>> Get(string Id)
{
var entity = await _service.QueryById(Id);
if (entity == null)
return MessageModel<Ghra_GradeDto>.Fail("获取失败");
return ServiceResult<Ghra_GradeDto>.Fail("获取失败");
else
return new MessageModel<Ghra_GradeDto>() { msg = "获取成功", success = true, response = entity };
return new ServiceResult<Ghra_GradeDto>() { msg = "获取成功", success = true, response = entity };
}
#endregion
@ -50,9 +50,9 @@
/// <param name="insertModel"></param>
/// <returns></returns>
[HttpPost]
public async Task<MessageModel<string>> Post([FromBody] InsertGhra_GradeInput insertModel)
public async Task<ServiceResult<string>> Post([FromBody] InsertGhra_GradeInput insertModel)
{
var data = MessageModel<string>.Success("获取成功", null);
var data = ServiceResult<string>.OprateSuccess("获取成功", null);
var id = await _service.Add(insertModel);
data.success = id > 0;
@ -71,9 +71,9 @@
/// <param name="editModel"></param>
/// <returns></returns>
[HttpPut("{Id}")]
public async Task<MessageModel> Put(long Id, [FromBody] EditGhra_GradeInput editModel)
public async Task<ServiceResult> Put(long Id, [FromBody] EditGhra_GradeInput editModel)
{
var data = MessageModel.Success("更新成功");
var data = ServiceResult.OprateSuccess("更新成功");
data.success = await _service.Update(Id, editModel);
if (!data.success)
data.msg = "更新失败";
@ -89,12 +89,12 @@
/// <param name="Id"></param>
/// <returns></returns>
[HttpDelete("{Id}")]
public async Task<MessageModel> Delete(long Id)
public async Task<ServiceResult> Delete(long Id)
{
var data = MessageModel.Success("删除成功");
var data = ServiceResult.OprateSuccess("删除成功");
var entity = await _service.QueryById(Id);
if (entity == null)
return MessageModel.Fail("删除失败");
return ServiceResult.OprateFailed("删除失败");
entity.IsEnable = 0;
data.success = await _service.Update(entity);

@ -46,7 +46,7 @@
/// <returns></returns>
[HttpPost]
[Route("/images/Upload/Pic")]
public async Task<MessageModel<string>> InsertPicture([FromForm] UploadFileDto dto)
public async Task<ServiceResult<string>> InsertPicture([FromForm] UploadFileDto dto)
{
if (dto.file == null || !dto.file.Any()) return Failed("请选择上传的文件。");

@ -55,7 +55,7 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
[HttpGet]
[Route("Token")]
public async Task<MessageModel<string>> GetJwtStr(string name, string pass)
public async Task<ServiceResult<string>> GetJwtStr(string name, string pass)
{
string jwtStr = string.Empty;
bool suc = false;
@ -74,7 +74,7 @@ namespace Tiobon.Core.Controllers
jwtStr = "login fail!!!";
}
return new MessageModel<string>()
return new ServiceResult<string>()
{
success = suc,
msg = suc ? "获取成功" : "获取失败",
@ -91,7 +91,7 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
[HttpGet]
[Route("GetTokenNuxt")]
public MessageModel<string> GetJwtStrForNuxt(string name, string pass)
public ServiceResult<string> GetJwtStrForNuxt(string name, string pass)
{
string jwtStr = string.Empty;
bool suc = false;
@ -118,7 +118,7 @@ namespace Tiobon.Core.Controllers
data = new {success = suc, token = jwtStr}
};
return new MessageModel<string>()
return new ServiceResult<string>()
{
success = suc,
msg = suc ? "获取成功" : "获取失败",
@ -137,7 +137,7 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
[HttpGet]
[Route("JWTToken3.0")]
public async Task<MessageModel<TokenInfoViewModel>> GetJwtToken3(string name = "", string pass = "")
public async Task<ServiceResult<TokenInfoViewModel>> GetJwtToken3(string name = "", string pass = "")
{
string jwtStr = string.Empty;
@ -193,7 +193,7 @@ namespace Tiobon.Core.Controllers
[HttpGet]
[Route("GetJwtTokenSecret")]
public async Task<MessageModel<TokenInfoViewModel>> GetJwtTokenSecret(string name = "", string pass = "")
public async Task<ServiceResult<TokenInfoViewModel>> GetJwtTokenSecret(string name = "", string pass = "")
{
var rlt = await GetJwtToken3(name, pass);
return rlt;
@ -206,7 +206,7 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
[HttpGet]
[Route("RefreshToken")]
public async Task<MessageModel<TokenInfoViewModel>> RefreshToken(string token = "")
public async Task<ServiceResult<TokenInfoViewModel>> RefreshToken(string token = "")
{
string jwtStr = string.Empty;

@ -26,7 +26,7 @@
/// <returns></returns>
// GET: api/User
[HttpGet]
public async Task<MessageModel<PageModel<Modules>>> Get(int page = 1, string key = "")
public async Task<ServiceResult<PageModel<Modules>>> Get(int page = 1, string key = "")
{
if (string.IsNullOrEmpty(key) || string.IsNullOrWhiteSpace(key))
{
@ -68,7 +68,7 @@
/// <returns></returns>
// POST: api/User
[HttpPost]
public async Task<MessageModel<string>> Post([FromBody] Modules module)
public async Task<ServiceResult<string>> Post([FromBody] Modules module)
{
module.CreateId = _user.ID;
module.CreateBy = _user.Name;
@ -84,9 +84,9 @@
/// <returns></returns>
// PUT: api/User/5
[HttpPut]
public async Task<MessageModel<string>> Put([FromBody] Modules module)
public async Task<ServiceResult<string>> Put([FromBody] Modules module)
{
//var data = new MessageModel<string>();
//var data = new ServiceResult<string>();
//if (module != null && module.Id > 0)
//{
//data.success = await _moduleServices.Update(module);
@ -111,7 +111,7 @@
/// <returns></returns>
// DELETE: api/ApiWithActions/5
[HttpDelete]
public async Task<MessageModel<string>> Delete(long id)
public async Task<ServiceResult<string>> Delete(long id)
{
if (id <= 0)
return Failed("缺少参数");
@ -122,7 +122,7 @@
userDetail.IsDeleted = true;
return await _moduleServices.Update(userDetail) ? Success(userDetail?.Id.ObjToString(), "删除成功") : Failed("删除失败");
//var data = new MessageModel<string>();
//var data = new ServiceResult<string>();
//if (id > 0)
//{
// var userDetail = await _moduleServices.QueryById(id);
@ -144,7 +144,7 @@
/// <returns></returns>
// POST: api/User
[HttpPost]
public async Task<MessageModel<string>> BatchPost([FromBody] List<Modules> modules)
public async Task<ServiceResult<string>> BatchPost([FromBody] List<Modules> modules)
{
string ids = string.Empty;
int sucCount = 0;

@ -29,7 +29,7 @@ namespace Tiobon.Core.Controllers
/// </summary>
/// <returns></returns>
[HttpGet]
public MessageModel<ServerViewModel> Server()
public ServiceResult<ServerViewModel> Server()
{
return Success(new ServerViewModel()
{
@ -50,7 +50,7 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
// GET: api/Logs
[HttpGet]
public MessageModel<List<LogInfo>> Get()
public ServiceResult<List<LogInfo>> Get()
{
if (AppSettings.app(new string[] { "Middleware", "SignalRSendLog", "Enabled" }).ObjToBool())
{
@ -62,15 +62,15 @@ namespace Tiobon.Core.Controllers
[HttpGet]
public MessageModel<RequestApiWeekView> GetRequestApiinfoByWeek()
public ServiceResult<RequestApiWeekView> GetRequestApiinfoByWeek()
{
return Success(LogLock.RequestApiinfoByWeek(), "成功");
}
[HttpGet]
public MessageModel<AccessApiDateView> GetAccessApiByDate()
public ServiceResult<AccessApiDateView> GetAccessApiByDate()
{
//return new MessageModel<AccessApiDateView>()
//return new ServiceResult<AccessApiDateView>()
//{
// msg = "获取成功",
// success = true,
@ -81,9 +81,9 @@ namespace Tiobon.Core.Controllers
}
[HttpGet]
public MessageModel<AccessApiDateView> GetAccessApiByHour()
public ServiceResult<AccessApiDateView> GetAccessApiByHour()
{
//return new MessageModel<AccessApiDateView>()
//return new ServiceResult<AccessApiDateView>()
//{
// msg = "获取成功",
// success = true,
@ -159,7 +159,7 @@ namespace Tiobon.Core.Controllers
}
[HttpGet]
public MessageModel<WelcomeInitData> GetActiveUsers([FromServices] IWebHostEnvironment environment)
public ServiceResult<WelcomeInitData> GetActiveUsers([FromServices] IWebHostEnvironment environment)
{
var accessLogsToday = GetAccessLogsToday(environment).Where(d => d.BeginTime.ObjToDate() >= DateTime.Today);
@ -180,7 +180,7 @@ namespace Tiobon.Core.Controllers
int activeUsersCount = activeUsers.Count;
activeUsers = activeUsers.OrderByDescending(d => d.count).Take(10).ToList();
//return new MessageModel<WelcomeInitData>()
//return new ServiceResult<WelcomeInitData>()
//{
// msg = "获取成功",
// success = true,
@ -205,7 +205,7 @@ namespace Tiobon.Core.Controllers
}
[HttpGet]
public async Task<MessageModel<AccessApiDateView>> GetIds4Users()
public async Task<ServiceResult<AccessApiDateView>> GetIds4Users()
{
List<ApiDate> apiDates = new List<ApiDate>();
@ -233,7 +233,7 @@ namespace Tiobon.Core.Controllers
count = 0
});
}
//return new MessageModel<AccessApiDateView>()
//return new ServiceResult<AccessApiDateView>()
//{
// msg = "获取成功",
// success = true,

@ -39,11 +39,11 @@ namespace Tiobon.Core.Api.Controllers
/// <returns></returns>
[HttpGet]
public MessageModel<string> CheckSystemStartFinish()
public ServiceResult<string> CheckSystemStartFinish()
{
//********************* 用当前接口做基本健康检查 确定 基础服务 数据库 缓存都已正常启动*****
// 然后再进行服务上线
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
// *************** 此处请求一下db 跟redis连接等 项目中简介 保证项目已全部启动
data.success = true;
data.msg = "SUCCESS";
@ -57,9 +57,9 @@ namespace Tiobon.Core.Api.Controllers
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<string>> GetStatus()
public async Task<ServiceResult<string>> GetStatus()
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
var instances = await NacosNamingService.GetAllInstances(JsonConfigSettings.NacosServiceName);
if (instances == null || instances.Count == 0)
{
@ -99,9 +99,9 @@ namespace Tiobon.Core.Api.Controllers
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<string>> Register()
public async Task<ServiceResult<string>> Register()
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
var instance = new Nacos.V2.Naming.Dtos.Instance()
{
ServiceName = JsonConfigSettings.NacosServiceName,
@ -123,9 +123,9 @@ namespace Tiobon.Core.Api.Controllers
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<string>> Deregister()
public async Task<ServiceResult<string>> Deregister()
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
await NacosNamingService.DeregisterInstance(JsonConfigSettings.NacosServiceName, Nacos.V2.Common.Constants.DEFAULT_GROUP, IpHelper.GetCurrentIp(null), JsonConfigSettings.NacosPort);
data.success = true;
data.msg = "SUCCESS";

@ -27,7 +27,7 @@
/// <returns></returns>
[HttpGet]
[Route("Pay")]
public async Task<MessageModel<PayReturnResultModel>> PayGet([FromQuery]PayNeedModel payModel)
public async Task<ServiceResult<PayReturnResultModel>> PayGet([FromQuery]PayNeedModel payModel)
{
return await _payServices.Pay(payModel);
}
@ -38,7 +38,7 @@
/// <returns></returns>
[HttpPost]
[Route("Pay")]
public async Task<MessageModel<PayReturnResultModel>> PayPost([FromBody]PayNeedModel payModel)
public async Task<ServiceResult<PayReturnResultModel>> PayPost([FromBody]PayNeedModel payModel)
{
return await _payServices.Pay(payModel);
}
@ -49,7 +49,7 @@
/// <returns></returns>
[HttpGet]
[Route("PayCheck")]
public async Task<MessageModel<PayReturnResultModel>> PayCheckGet([FromQuery]PayNeedModel payModel)
public async Task<ServiceResult<PayReturnResultModel>> PayCheckGet([FromQuery]PayNeedModel payModel)
{
return await _payServices.PayCheck(payModel, 1);
}
@ -60,7 +60,7 @@
/// <returns></returns>
[HttpPost]
[Route("PayCheck")]
public async Task<MessageModel<PayReturnResultModel>> PayCheckPost([FromBody]PayNeedModel payModel)
public async Task<ServiceResult<PayReturnResultModel>> PayCheckPost([FromBody]PayNeedModel payModel)
{
return await _payServices.PayCheck(payModel, 1);
}
@ -71,7 +71,7 @@
/// <returns></returns>
[HttpGet]
[Route("PayRefund")]
public async Task<MessageModel<PayRefundReturnResultModel>> PayRefundGet([FromQuery]PayRefundNeedModel payModel)
public async Task<ServiceResult<PayRefundReturnResultModel>> PayRefundGet([FromQuery]PayRefundNeedModel payModel)
{
return await _payServices.PayRefund(payModel);
}
@ -82,7 +82,7 @@
/// <returns></returns>
[HttpPost]
[Route("PayRefund")]
public async Task<MessageModel<PayRefundReturnResultModel>> PayRefundPost([FromBody]PayRefundNeedModel payModel)
public async Task<ServiceResult<PayRefundReturnResultModel>> PayRefundPost([FromBody]PayRefundNeedModel payModel)
{
return await _payServices.PayRefund(payModel);
}

@ -61,7 +61,7 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
// GET: api/User
[HttpGet]
public async Task<MessageModel<PageModel<Permission>>> Get(int page = 1, string key = "", int pageSize = 50)
public async Task<ServiceResult<PageModel<Permission>>> Get(int page = 1, string key = "", int pageSize = 50)
{
PageModel<Permission> permissions = new PageModel<Permission>();
if (string.IsNullOrEmpty(key) || string.IsNullOrWhiteSpace(key))
@ -118,7 +118,7 @@ namespace Tiobon.Core.Controllers
#endregion
//return new MessageModel<PageModel<Permission>>()
//return new ServiceResult<PageModel<Permission>>()
//{
// msg = "获取成功",
// success = permissions.dataCount >= 0,
@ -137,7 +137,7 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<MessageModel<List<Permission>>> GetTreeTable(long f = 0, string key = "")
public async Task<ServiceResult<List<Permission>>> GetTreeTable(long f = 0, string key = "")
{
List<Permission> permissions = new List<Permission>();
var apiList = await _moduleServices.Query(d => d.IsDeleted == false);
@ -178,7 +178,7 @@ namespace Tiobon.Core.Controllers
}
//return new MessageModel<List<Permission>>()
//return new ServiceResult<List<Permission>>()
//{
// msg = "获取成功",
// success = true,
@ -194,9 +194,9 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
// POST: api/User
[HttpPost]
public async Task<MessageModel<string>> Post([FromBody] Permission permission)
public async Task<ServiceResult<string>> Post([FromBody] Permission permission)
{
//var data = new MessageModel<string>();
//var data = new ServiceResult<string>();
permission.CreateId = _user.ID;
permission.CreateBy = _user.Name;
@ -219,7 +219,7 @@ namespace Tiobon.Core.Controllers
/// <param name="assignView"></param>
/// <returns></returns>
[HttpPost]
public async Task<MessageModel<string>> Assign([FromBody] AssignView assignView)
public async Task<ServiceResult<string>> Assign([FromBody] AssignView assignView)
{
if (assignView.rid > 0)
{
@ -280,9 +280,9 @@ namespace Tiobon.Core.Controllers
/// <param name="needbtn"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<PermissionTree>> GetPermissionTree(long pid = 0, bool needbtn = false)
public async Task<ServiceResult<PermissionTree>> GetPermissionTree(long pid = 0, bool needbtn = false)
{
//var data = new MessageModel<PermissionTree>();
//var data = new ServiceResult<PermissionTree>();
var permissions = await _permissionServices.Query(d => d.IsDeleted == false);
var permissionTrees = (from child in permissions
@ -325,10 +325,10 @@ namespace Tiobon.Core.Controllers
/// <param name="uid"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<NavigationBar>> GetNavigationBar(long uid)
public async Task<ServiceResult<NavigationBar>> GetNavigationBar(long uid)
{
var data = new MessageModel<NavigationBar>();
var data = new ServiceResult<NavigationBar>();
long uidInHttpcontext1 = 0;
var roleIds = new List<long>();
@ -429,9 +429,9 @@ namespace Tiobon.Core.Controllers
/// <param name="uid"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<List<NavigationBarPro>>> GetNavigationBarPro(long uid)
public async Task<ServiceResult<List<NavigationBarPro>>> GetNavigationBarPro(long uid)
{
var data = new MessageModel<List<NavigationBarPro>>();
var data = new ServiceResult<List<NavigationBarPro>>();
long uidInHttpcontext1 = 0;
var roleIds = new List<long>();
@ -518,9 +518,9 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<MessageModel<AssignShow>> GetPermissionIdByRoleId(long rid = 0)
public async Task<ServiceResult<AssignShow>> GetPermissionIdByRoleId(long rid = 0)
{
//var data = new MessageModel<AssignShow>();
//var data = new ServiceResult<AssignShow>();
var rmps = await _roleModulePermissionServices.Query(d => d.IsDeleted == false && d.RoleId == rid);
var permissionTrees = (from child in rmps
@ -567,9 +567,9 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
// PUT: api/User/5
[HttpPut]
public async Task<MessageModel<string>> Put([FromBody] Permission permission)
public async Task<ServiceResult<string>> Put([FromBody] Permission permission)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
if (permission != null && permission.Id > 0)
{
data.success = await _permissionServices.Update(permission);
@ -591,9 +591,9 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
// DELETE: api/ApiWithActions/5
[HttpDelete]
public async Task<MessageModel<string>> Delete(long id)
public async Task<ServiceResult<string>> Delete(long id)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
if (id > 0)
{
var userDetail = await _permissionServices.QueryById(id);
@ -616,9 +616,9 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
// POST: api/User
[HttpPost]
public async Task<MessageModel<string>> BatchPost([FromBody] List<Permission> permissions)
public async Task<ServiceResult<string>> BatchPost([FromBody] List<Permission> permissions)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
string ids = string.Empty;
int sucCount = 0;
@ -649,9 +649,9 @@ namespace Tiobon.Core.Controllers
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<List<Permission>>> MigratePermission(string action = "", string token = "", string gatewayPrefix = "", string swaggerDomain = "", string controllerName = "", long pid = 0, bool isAction = false)
public async Task<ServiceResult<List<Permission>>> MigratePermission(string action = "", string token = "", string gatewayPrefix = "", string swaggerDomain = "", string controllerName = "", long pid = 0, bool isAction = false)
{
var data = new MessageModel<List<Permission>>();
var data = new ServiceResult<List<Permission>>();
if (controllerName.IsNullOrEmpty())
{
data.msg = "必须填写要迁移的所属接口的控制器名称";

@ -26,7 +26,7 @@
/// <returns></returns>
// GET: api/User
[HttpGet]
public async Task<MessageModel<PageModel<Role>>> Get(int page = 1, string key = "")
public async Task<ServiceResult<PageModel<Role>>> Get(int page = 1, string key = "")
{
if (string.IsNullOrEmpty(key) || string.IsNullOrWhiteSpace(key))
{
@ -37,7 +37,7 @@
var data = await _roleServices.QueryPage(a => a.IsDeleted != true && (a.Name != null && a.Name.Contains(key)), page, intPageSize, " Id desc ");
//return new MessageModel<PageModel<Role>>()
//return new ServiceResult<PageModel<Role>>()
//{
// msg = "获取成功",
// success = data.dataCount >= 0,
@ -62,7 +62,7 @@
/// <returns></returns>
// POST: api/User
[HttpPost]
public async Task<MessageModel<string>> Post([FromBody] Role role)
public async Task<ServiceResult<string>> Post([FromBody] Role role)
{
role.CreateId = _user.ID;
role.CreateBy = _user.Name;
@ -78,14 +78,14 @@
/// <returns></returns>
// PUT: api/User/5
[HttpPut]
public async Task<MessageModel<string>> Put([FromBody] Role role)
public async Task<ServiceResult<string>> Put([FromBody] Role role)
{
if (role == null || role.Id <= 0)
return Failed("缺少参数");
return await _roleServices.Update(role) ? Success(role?.Id.ObjToString(),"更新成功") : Failed("更新失败");
//var data = new MessageModel<string>();
//var data = new ServiceResult<string>();
//if (role != null && role.Id > 0)
//{
// data.success = await _roleServices.Update(role);
@ -105,10 +105,10 @@
/// <returns></returns>
// DELETE: api/ApiWithActions/5
[HttpDelete]
public async Task<MessageModel<string>> Delete(long id)
public async Task<ServiceResult<string>> Delete(long id)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
//if (id > 0)
//{
// var userDetail = await _roleServices.QueryById(id);

@ -27,7 +27,7 @@
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<MessageModel<PageModel<SplitDemo>>> Get(DateTime beginTime, DateTime endTime, int page = 1, string key = "", int pageSize = 10)
public async Task<ServiceResult<PageModel<SplitDemo>>> Get(DateTime beginTime, DateTime endTime, int page = 1, string key = "", int pageSize = 10)
{
if (string.IsNullOrEmpty(key) || string.IsNullOrWhiteSpace(key))
{
@ -35,7 +35,7 @@
}
Expression<Func<SplitDemo, bool>> whereExpression = a => (a.Name != null && a.Name.Contains(key));
var data = await splitDemoServices.QueryPageSplit(whereExpression, beginTime, endTime, page, pageSize, " Id desc ");
return MessageModel<PageModel<SplitDemo>>.Message(data.dataCount >= 0, "获取成功", data);
return ServiceResult<PageModel<SplitDemo>>.Message(data.dataCount >= 0, "获取成功", data);
}
/// <summary>
@ -45,17 +45,17 @@
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<MessageModel<SplitDemo>> GetById(long id)
public async Task<ServiceResult<SplitDemo>> GetById(long id)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
var model = await splitDemoServices.QueryByIdSplit(id);
if (model != null)
{
return MessageModel<SplitDemo>.Success("获取成功", model);
return ServiceResult<SplitDemo>.OprateSuccess("获取成功", model);
}
else
{
return MessageModel<SplitDemo>.Fail("获取失败");
return ServiceResult<SplitDemo>.Fail("获取失败");
}
}
@ -66,9 +66,9 @@
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public async Task<MessageModel<string>> Post([FromBody] SplitDemo splitDemo)
public async Task<ServiceResult<string>> Post([FromBody] SplitDemo splitDemo)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
//unitOfWorkManage.BeginTran();
var id = (await splitDemoServices.AddSplit(splitDemo));
data.success = (id == null ? false : true);
@ -105,9 +105,9 @@
/// <returns></returns>
[HttpPut]
[AllowAnonymous]
public async Task<MessageModel<string>> Put([FromBody] SplitDemo splitDemo)
public async Task<ServiceResult<string>> Put([FromBody] SplitDemo splitDemo)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
if (splitDemo != null && splitDemo.Id > 0)
{
unitOfWorkManage.BeginTran();
@ -146,9 +146,9 @@
/// <returns></returns>
[HttpDelete]
[AllowAnonymous]
public async Task<MessageModel<string>> Delete(long id)
public async Task<ServiceResult<string>> Delete(long id)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
var model = await splitDemoServices.QueryByIdSplit(id);
if (model != null)

@ -1,4 +1,5 @@
using Tiobon.Core.Common.Caches;
using Tiobon.Core.Model;
namespace Tiobon.Core.Api.Controllers.Systems;
/// <summary>
@ -21,7 +22,7 @@ public class CacheManageController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<List<string>>> Get()
public async Task<ServiceResult<List<string>>> Get()
{
return Success(await _caching.GetAllCacheKeysAsync());
}
@ -31,7 +32,7 @@ public class CacheManageController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpGet("{key}")]
public async Task<MessageModel<string>> Get(string key)
public async Task<ServiceResult<string>> Get(string key)
{
return Success<string>(await _caching.GetStringAsync(key));
}
@ -41,7 +42,7 @@ public class CacheManageController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<MessageModel> Post([FromQuery] string key, [FromQuery] string value, [FromQuery] int? expire)
public async Task<ServiceResult> Post([FromQuery] string key, [FromQuery] string value, [FromQuery] int? expire)
{
if (expire.HasValue)
await _caching.SetStringAsync(key, value, TimeSpan.FromMilliseconds(expire.Value));
@ -56,7 +57,7 @@ public class CacheManageController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpDelete]
public async Task<MessageModel> Delete()
public async Task<ServiceResult> Delete()
{
await _caching.RemoveAllAsync();
return Success();
@ -68,7 +69,7 @@ public class CacheManageController : BaseApiController
/// <returns></returns>
[Route("{key}")]
[HttpDelete]
public async Task<MessageModel> Delete(string key)
public async Task<ServiceResult> Delete(string key)
{
await _caching.RemoveAsync(key);
return Success();

@ -4,6 +4,7 @@ using Tiobon.Core.Model.Systems.DataBase;
using Tiobon.Core.Model.Tenants;
using Mapster;
using SqlSugar;
using Tiobon.Core.Model;
namespace Tiobon.Core.Api.Controllers.Systems;
@ -51,7 +52,7 @@ public class DataBaseController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<List<DatabaseOutput>>> GetAllConfig()
public async Task<ServiceResult<List<DatabaseOutput>>> GetAllConfig()
{
//增加多租户的连接
var allConfigs = new List<ConnectionConfig>(BaseDBConfig.AllConfigs);
@ -74,7 +75,7 @@ public class DataBaseController : BaseApiController
/// <param name="readType">读取类型</param>
/// <returns></returns>
[HttpGet]
public MessageModel<List<DbTableInfo>> GetTableInfoList(string configId,
public ServiceResult<List<DbTableInfo>> GetTableInfoList(string configId,
DataBaseReadType readType = DataBaseReadType.Db)
{
if (configId.IsNullOrEmpty())
@ -114,7 +115,7 @@ public class DataBaseController : BaseApiController
/// <param name="readType">读取类型</param>
/// <returns></returns>
[HttpGet]
public MessageModel<List<DbColumnInfoOutput>> GetColumnInfosByTableName(string tableName, string configId = null,
public ServiceResult<List<DbColumnInfoOutput>> GetColumnInfosByTableName(string tableName, string configId = null,
DataBaseReadType readType = DataBaseReadType.Db)
{
if (string.IsNullOrWhiteSpace(tableName))
@ -154,7 +155,7 @@ public class DataBaseController : BaseApiController
/// </summary>
/// <param name="input"></param>
[HttpPut]
public MessageModel PutTableEditRemark([FromBody] EditTableInput input)
public ServiceResult PutTableEditRemark([FromBody] EditTableInput input)
{
var provider = GetTenantDb(input.ConfigId);
if (provider.DbMaintenance.IsAnyTableRemark(input.TableName))
@ -171,7 +172,7 @@ public class DataBaseController : BaseApiController
/// </summary>
/// <param name="input"></param>
[HttpPut]
public MessageModel PutColumnEditRemark([FromBody] EditColumnInput input)
public ServiceResult PutColumnEditRemark([FromBody] EditColumnInput input)
{
var provider = GetTenantDb(input.ConfigId);
if (provider.DbMaintenance.IsAnyColumnRemark(input.DbColumnName, input.TableName))

@ -1,6 +1,7 @@
using Tiobon.Core.Common.DB.Extension;
using Tiobon.Core.Model.Models.RootTkey;
using SqlSugar;
using Tiobon.Core.Model;
namespace Tiobon.Core.Api.Controllers.Systems;
@ -55,7 +56,7 @@ public class DynamicCodeFirstController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpPost]
public MessageModel TestCreateTable()
public ServiceResult TestCreateTable()
{
var type = GetDynamicType();
_db.CodeFirst.InitTables(type);
@ -67,7 +68,7 @@ public class DynamicCodeFirstController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpGet]
public MessageModel<object> TestQuery()
public ServiceResult<object> TestQuery()
{
var type = GetDynamicType();
return Success(_db.QueryableByObject(type).ToList());
@ -78,7 +79,7 @@ public class DynamicCodeFirstController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpPost]
public MessageModel TestInsert(string code, string name)
public ServiceResult TestInsert(string code, string name)
{
var type = GetDynamicType();
var entity = Activator.CreateInstance(type);

@ -30,7 +30,7 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
// GET: api/Buttons/5
[HttpGet]
public async Task<MessageModel<PageModel<TasksQz>>> Get(int page = 1, string key = "")
public async Task<ServiceResult<PageModel<TasksQz>>> Get(int page = 1, string key = "")
{
if (string.IsNullOrEmpty(key) || string.IsNullOrWhiteSpace(key))
{
@ -48,7 +48,7 @@ namespace Tiobon.Core.Controllers
item.Triggers = await _schedulerCenter.GetTaskStaus(item);
}
}
return MessageModel<PageModel<TasksQz>>.Message(data.dataCount >= 0, "获取成功", data);
return ServiceResult<PageModel<TasksQz>>.Message(data.dataCount >= 0, "获取成功", data);
}
/// <summary>
@ -57,9 +57,9 @@ namespace Tiobon.Core.Controllers
/// <param name="tasksQz"></param>
/// <returns></returns>
[HttpPost]
public async Task<MessageModel<string>> Post([FromBody] TasksQz tasksQz)
public async Task<ServiceResult<string>> Post([FromBody] TasksQz tasksQz)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
_unitOfWorkManage.BeginTran();
var id = (await _tasksQzServices.Add(tasksQz));
data.success = id > 0;
@ -112,9 +112,9 @@ namespace Tiobon.Core.Controllers
/// <param name="tasksQz"></param>
/// <returns></returns>
[HttpPut]
public async Task<MessageModel<string>> Put([FromBody] TasksQz tasksQz)
public async Task<ServiceResult<string>> Put([FromBody] TasksQz tasksQz)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
if (tasksQz != null && tasksQz.Id > 0)
{
_unitOfWorkManage.BeginTran();
@ -164,9 +164,9 @@ namespace Tiobon.Core.Controllers
/// <param name="jobId"></param>
/// <returns></returns>
[HttpDelete]
public async Task<MessageModel<string>> Delete(long jobId)
public async Task<ServiceResult<string>> Delete(long jobId)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
var model = await _tasksQzServices.QueryById(jobId);
if (model != null)
@ -213,9 +213,9 @@ namespace Tiobon.Core.Controllers
/// <param name="jobId"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<string>> StartJob(long jobId)
public async Task<ServiceResult<string>> StartJob(long jobId)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
var model = await _tasksQzServices.QueryById(jobId);
if (model != null)
@ -270,9 +270,9 @@ namespace Tiobon.Core.Controllers
/// <param name="jobId"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<string>> StopJob(long jobId)
public async Task<ServiceResult<string>> StopJob(long jobId)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
var model = await _tasksQzServices.QueryById(jobId);
if (model != null)
@ -310,9 +310,9 @@ namespace Tiobon.Core.Controllers
/// <param name="jobId"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<string>> PauseJob(long jobId)
public async Task<ServiceResult<string>> PauseJob(long jobId)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
var model = await _tasksQzServices.QueryById(jobId);
if (model != null)
{
@ -364,9 +364,9 @@ namespace Tiobon.Core.Controllers
/// <param name="jobId"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<string>> ResumeJob(long jobId)
public async Task<ServiceResult<string>> ResumeJob(long jobId)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
var model = await _tasksQzServices.QueryById(jobId);
if (model != null)
@ -420,9 +420,9 @@ namespace Tiobon.Core.Controllers
/// <param name="jobId"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<string>> ReCovery(long jobId)
public async Task<ServiceResult<string>> ReCovery(long jobId)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
var model = await _tasksQzServices.QueryById(jobId);
if (model != null)
{
@ -480,7 +480,7 @@ namespace Tiobon.Core.Controllers
/// </summary>
/// <returns></returns>
[HttpGet]
public MessageModel<List<QuartzReflectionViewModel>> GetTaskNameSpace()
public ServiceResult<List<QuartzReflectionViewModel>> GetTaskNameSpace()
{
var baseType = typeof(IJob);
var path = AppDomain.CurrentDomain.RelativeSearchPath ?? AppDomain.CurrentDomain.BaseDirectory;
@ -490,7 +490,7 @@ namespace Tiobon.Core.Controllers
.Select(type => type.AsType())
.Where(x => x != baseType && baseType.IsAssignableFrom(x)).ToArray();
var implementTypes = types.Where(x => x.IsClass).Select(item => new QuartzReflectionViewModel { nameSpace = item.Namespace, nameClass = item.Name, remark = "" }).ToList();
return MessageModel<List<QuartzReflectionViewModel>>.Success("获取成功", implementTypes);
return ServiceResult<List<QuartzReflectionViewModel>>.OprateSuccess("获取成功", implementTypes);
}
/// <summary>
@ -499,9 +499,9 @@ namespace Tiobon.Core.Controllers
/// <param name="jobId"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<string>> ExecuteJob(long jobId)
public async Task<ServiceResult<string>> ExecuteJob(long jobId)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
var model = await _tasksQzServices.QueryById(jobId);
if (model != null)
@ -519,20 +519,20 @@ namespace Tiobon.Core.Controllers
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<PageModel<TasksLog>>> GetTaskLogs(long jobId, int page = 1, int pageSize = 10, DateTime? runTimeStart = null, DateTime? runTimeEnd = null)
public async Task<ServiceResult<PageModel<TasksLog>>> GetTaskLogs(long jobId, int page = 1, int pageSize = 10, DateTime? runTimeStart = null, DateTime? runTimeEnd = null)
{
var model = await _tasksLogServices.GetTaskLogs(jobId, page, pageSize, runTimeStart, runTimeEnd);
return MessageModel<PageModel<TasksLog>>.Message(model.dataCount >= 0, "获取成功", model);
return ServiceResult<PageModel<TasksLog>>.Message(model.dataCount >= 0, "获取成功", model);
}
/// <summary>
/// 任务概况
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<object>> GetTaskOverview(long jobId, int page = 1, int pageSize = 10, DateTime? runTimeStart = null, DateTime? runTimeEnd = null, string type = "month")
public async Task<ServiceResult<object>> GetTaskOverview(long jobId, int page = 1, int pageSize = 10, DateTime? runTimeStart = null, DateTime? runTimeEnd = null, string type = "month")
{
var model = await _tasksLogServices.GetTaskOverview(jobId, runTimeStart, runTimeEnd, type);
return MessageModel<object>.Message(true, "获取成功", model);
return ServiceResult<object>.Message(true, "获取成功", model);
}
}

@ -1,4 +1,5 @@
using Tiobon.Core.IServices.BASE;
using Tiobon.Core.Model;
namespace Tiobon.Core.Api.Controllers.Tenant;
@ -24,7 +25,7 @@ public class TenantByDbController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<List<SubLibraryBusinessTable>>> GetAll()
public async Task<ServiceResult<List<SubLibraryBusinessTable>>> GetAll()
{
var data = await _services.Query();
return Success(data);
@ -35,7 +36,7 @@ public class TenantByDbController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<MessageModel> Post(SubLibraryBusinessTable data)
public async Task<ServiceResult> Post(SubLibraryBusinessTable data)
{
await _services.Db.Insertable(data).ExecuteReturnSnowflakeIdAsync();

@ -24,7 +24,7 @@ public class TenantByIdController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<List<BusinessTable>>> GetAll()
public async Task<ServiceResult<List<BusinessTable>>> GetAll()
{
var data = await _services.Query();
return Success(data);
@ -35,7 +35,7 @@ public class TenantByIdController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<MessageModel> Post([FromBody] BusinessTable data)
public async Task<ServiceResult> Post([FromBody] BusinessTable data)
{
await _services.Db.Insertable(data).ExecuteReturnSnowflakeIdAsync();
return Success();

@ -1,4 +1,5 @@
using Tiobon.Core.IServices.BASE;
using Tiobon.Core.Model;
namespace Tiobon.Core.Api.Controllers.Tenant;
@ -24,7 +25,7 @@ public class TenantByTableController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<List<MultiBusinessTable>>> GetAll()
public async Task<ServiceResult<List<MultiBusinessTable>>> GetAll()
{
//查询
// var data = await _services.Query();
@ -42,7 +43,7 @@ public class TenantByTableController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<MessageModel> Post(MultiBusinessTable data)
public async Task<ServiceResult> Post(MultiBusinessTable data)
{
await _services.Db.Insertable(data).ExecuteReturnSnowflakeIdAsync();

@ -1,4 +1,6 @@
namespace Tiobon.Core.Api.Controllers.Tenant;
using Tiobon.Core.Model;
namespace Tiobon.Core.Api.Controllers.Tenant;
/// <summary>
/// 租户管理
@ -21,7 +23,7 @@ public class TenantManagerController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<List<SysTenant>>> GetAll()
public async Task<ServiceResult<List<SysTenant>>> GetAll()
{
var data = await _services.Query();
return Success(data);
@ -33,7 +35,7 @@ public class TenantManagerController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpGet("{id}")]
public async Task<MessageModel<SysTenant>> GetInfo(long id)
public async Task<ServiceResult<SysTenant>> GetInfo(long id)
{
var data = await _services.QueryById(id);
return Success(data);
@ -45,7 +47,7 @@ public class TenantManagerController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<MessageModel> Post(SysTenant tenant)
public async Task<ServiceResult> Post(SysTenant tenant)
{
await _services.SaveTenant(tenant);
return Success();
@ -57,7 +59,7 @@ public class TenantManagerController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpPut]
public async Task<MessageModel> Put(SysTenant tenant)
public async Task<ServiceResult> Put(SysTenant tenant)
{
await _services.SaveTenant(tenant);
return Success();
@ -69,7 +71,7 @@ public class TenantManagerController : BaseApiController
/// </summary>
/// <returns></returns>
[HttpDelete]
public async Task<MessageModel> Delete(long id)
public async Task<ServiceResult> Delete(long id)
{
//是否删除租户库?
//要根据实际情况而定

@ -25,9 +25,9 @@
/// <returns></returns>
// GET: api/Topic
[HttpGet]
public async Task<MessageModel<List<Topic>>> Get()
public async Task<ServiceResult<List<Topic>>> Get()
{
var data = new MessageModel<List<Topic>> {response = await _topicServices.GetTopics()};
var data = new ServiceResult<List<Topic>> {response = await _topicServices.GetTopics()};
if (data.response != null)
{
data.success = true;

@ -33,7 +33,7 @@
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<MessageModel<PageModel<TopicDetail>>> Get(int page = 1, string tname = "", string key = "", int intPageSize = 12)
public async Task<ServiceResult<PageModel<TopicDetail>>> Get(int page = 1, string tname = "", string key = "", int intPageSize = 12)
{
long tid = 0;
@ -57,7 +57,7 @@
return new MessageModel<PageModel<TopicDetail>>()
return new ServiceResult<PageModel<TopicDetail>>()
{
msg = "获取成功",
success = data.dataCount >= 0,
@ -74,9 +74,9 @@
// GET: api/TopicDetail/5
[HttpGet("{id}")]
[AllowAnonymous]
public async Task<MessageModel<TopicDetail>> Get(long id)
public async Task<ServiceResult<TopicDetail>> Get(long id)
{
var data = new MessageModel<TopicDetail>();
var data = new ServiceResult<TopicDetail>();
var response = id > 0 ? await _topicDetailServices.QueryById(id) : new TopicDetail();
data.response = (response?.tdIsDelete).ObjToBool() ? new TopicDetail() : response;
if (data.response != null)
@ -96,9 +96,9 @@
// POST: api/TopicDetail
[HttpPost]
[AllowAnonymous]
public async Task<MessageModel<string>> Post([FromBody] TopicDetail topicDetail)
public async Task<ServiceResult<string>> Post([FromBody] TopicDetail topicDetail)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
topicDetail.tdCreatetime = DateTime.Now;
topicDetail.tdRead = 0;
@ -124,9 +124,9 @@
/// <returns></returns>
// PUT: api/TopicDetail/5
[HttpPut]
public async Task<MessageModel<string>> Update([FromBody] TopicDetail topicDetail)
public async Task<ServiceResult<string>> Update([FromBody] TopicDetail topicDetail)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
if (topicDetail != null && topicDetail.Id > 0)
{
data.success = await _topicDetailServices.Update(topicDetail);
@ -147,9 +147,9 @@
/// <returns></returns>
// DELETE: api/ApiWithActions/5
[HttpDelete]
public async Task<MessageModel<string>> Delete(long id)
public async Task<ServiceResult<string>> Delete(long id)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
if (id > 0)
{
var topicDetail = await _topicDetailServices.QueryById(id);

@ -19,7 +19,7 @@
// GET: api/Transaction
[HttpGet]
public async Task<MessageModel<IEnumerable<string>>> Get()
public async Task<ServiceResult<IEnumerable<string>>> Get()
{
List<string> returnMsg = new List<string>() { };
try
@ -78,7 +78,7 @@
returnMsg.Add($"third time : the count of guestbooks is :{guestbooks.Count}");
}
return new MessageModel<IEnumerable<string>>()
return new ServiceResult<IEnumerable<string>>()
{
success = true,
msg = "操作完成",
@ -88,7 +88,7 @@
// GET: api/Transaction/5
[HttpGet("{id}")]
public async Task<MessageModel<string>> Get(long id)
public async Task<ServiceResult<string>> Get(long id)
{
return await _guestbookServices.TestTranInRepository();
}

@ -54,7 +54,7 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
// GET: api/User
[HttpGet]
public async Task<MessageModel<PageModel<SysUserInfoDto>>> Get(int page = 1, string key = "")
public async Task<ServiceResult<PageModel<SysUserInfoDto>>> Get(int page = 1, string key = "")
{
if (string.IsNullOrEmpty(key) || string.IsNullOrWhiteSpace(key))
{
@ -127,9 +127,9 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<MessageModel<SysUserInfoDto>> GetInfoByToken(string token)
public async Task<ServiceResult<SysUserInfoDto>> GetInfoByToken(string token)
{
var data = new MessageModel<SysUserInfoDto>();
var data = new ServiceResult<SysUserInfoDto>();
if (!string.IsNullOrEmpty(token))
{
var tokenModel = JwtHelper.SerializeJwt(token);
@ -155,9 +155,9 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
// POST: api/User
[HttpPost]
public async Task<MessageModel<string>> Post([FromBody] SysUserInfoDto sysUserInfo)
public async Task<ServiceResult<string>> Post([FromBody] SysUserInfoDto sysUserInfo)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
sysUserInfo.uLoginPWD = MD5Helper.MD5Encrypt32(sysUserInfo.uLoginPWD);
sysUserInfo.uRemark = _user.Name;
@ -180,10 +180,10 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
// PUT: api/User/5
[HttpPut]
public async Task<MessageModel<string>> Put([FromBody] SysUserInfoDto sysUserInfo)
public async Task<ServiceResult<string>> Put([FromBody] SysUserInfoDto sysUserInfo)
{
// 这里使用事务处理
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
var oldUser = await _sysUserInfoServices.QueryById(sysUserInfo.uID);
if (oldUser is not { Id: > 0 })
@ -255,9 +255,9 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
// DELETE: api/ApiWithActions/5
[HttpDelete]
public async Task<MessageModel<string>> Delete(long id)
public async Task<ServiceResult<string>> Delete(long id)
{
var data = new MessageModel<string>();
var data = new ServiceResult<string>();
if (id > 0)
{
var userDetail = await _sysUserInfoServices.QueryById(id);

@ -38,10 +38,10 @@
/// <param name="loginPwd"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<SysUserInfoDto>> AddUser(string loginName, string loginPwd)
public async Task<ServiceResult<SysUserInfoDto>> AddUser(string loginName, string loginPwd)
{
var userInfo = await _sysUserInfoServices.SaveUserInfo(loginName, loginPwd);
return new MessageModel<SysUserInfoDto>()
return new ServiceResult<SysUserInfoDto>()
{
success = true,
msg = "添加成功",
@ -55,9 +55,9 @@
/// <param name="roleName"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<Role>> AddRole(string roleName)
public async Task<ServiceResult<Role>> AddRole(string roleName)
{
return new MessageModel<Role>()
return new ServiceResult<Role>()
{
success = true,
msg = "添加成功",
@ -72,9 +72,9 @@
/// <param name="rid"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<UserRole>> AddUserRole(long uid, long rid)
public async Task<ServiceResult<UserRole>> AddUserRole(long uid, long rid)
{
return new MessageModel<UserRole>()
return new ServiceResult<UserRole>()
{
success = true,
msg = "添加成功",

@ -113,9 +113,9 @@ namespace Tiobon.Core.Controllers
}
[HttpGet]
public MessageModel<List<ClaimDto>> MyClaims()
public ServiceResult<List<ClaimDto>> MyClaims()
{
return new MessageModel<List<ClaimDto>>()
return new ServiceResult<List<ClaimDto>>()
{
success = true,
response = (_user.GetClaimsIdentity().ToList()).Select(d =>
@ -148,9 +148,9 @@ namespace Tiobon.Core.Controllers
// GET api/values
[HttpGet]
[AllowAnonymous]
public async Task<MessageModel<ResponseEnum>> Get()
public async Task<ServiceResult<ResponseEnum>> Get()
{
var data = new MessageModel<ResponseEnum>();
var data = new ServiceResult<ResponseEnum>();
/*
* sql
@ -209,7 +209,7 @@ namespace Tiobon.Core.Controllers
[HttpGet]
[AllowAnonymous]
public async Task<MessageModel<List<TiobonArticle>>> Test_Aop_Cache()
public async Task<ServiceResult<List<TiobonArticle>>> Test_Aop_Cache()
{
// 测试 AOP 缓存
var TiobonArticles = await _TiobonArticleServices.GetTiobons();
@ -286,10 +286,10 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
[HttpGet]
[Route("/api/values/UserInfo")]
public MessageModel<List<string>> GetUserInfo(string ClaimType = "jti")
public ServiceResult<List<string>> GetUserInfo(string ClaimType = "jti")
{
var getUserInfoByToken = _user.GetUserInfoFromToken(ClaimType);
return new MessageModel<List<string>>()
return new ServiceResult<List<string>>()
{
success = _user.IsAuthenticated(),
msg = _user.IsAuthenticated() ? _user.Name.ObjToString() : "未登录",

@ -23,10 +23,10 @@ namespace Tiobon.Core.Controllers
/// <param name="pagination">分页条件</param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<PageModel<WeChatCompany>>> Get([FromQuery] PaginationModel pagination)
public async Task<ServiceResult<PageModel<WeChatCompany>>> Get([FromQuery] PaginationModel pagination)
{
var data = await _WeChatCompanyServices.QueryPage(pagination);
return new MessageModel<PageModel<WeChatCompany>> { success = true, response = data};
return new ServiceResult<PageModel<WeChatCompany>> { success = true, response = data};
}
/// <summary>
/// 获取(id)
@ -34,51 +34,51 @@ namespace Tiobon.Core.Controllers
/// <param name="id">主键ID</param>
/// <returns></returns>
[HttpGet("{id}")]
public async Task<MessageModel<WeChatCompany>> Get(string id)
public async Task<ServiceResult<WeChatCompany>> Get(string id)
{
var data = await _WeChatCompanyServices.QueryById(id);
return new MessageModel<WeChatCompany> { success = true, response = data };
return new ServiceResult<WeChatCompany> { success = true, response = data };
}
/// <summary>
/// 添加
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<MessageModel<string>> Post([FromBody] WeChatCompany obj)
public async Task<ServiceResult<string>> Post([FromBody] WeChatCompany obj)
{
await _WeChatCompanyServices.Add(obj);
return new MessageModel<string> { success = true};
return new ServiceResult<string> { success = true};
}
/// <summary>
/// 更新
/// </summary>
/// <returns></returns>
[HttpPut]
public async Task<MessageModel<string>> Put([FromBody] WeChatCompany obj)
public async Task<ServiceResult<string>> Put([FromBody] WeChatCompany obj)
{
await _WeChatCompanyServices.Update(obj);
return new MessageModel<string> { success = true};
return new ServiceResult<string> { success = true};
}
/// <summary>
/// 删除
/// </summary>
/// <returns></returns>
[HttpDelete]
public async Task<MessageModel<string>> Delete(string id)
public async Task<ServiceResult<string>> Delete(string id)
{
await _WeChatCompanyServices.DeleteById(id);
return new MessageModel<string> { success = true};
return new ServiceResult<string> { success = true};
}
/// <summary>
/// 批量删除
/// </summary>
/// <returns></returns>
[HttpDelete]
public async Task<MessageModel<string>> BatchDelete(string ids)
public async Task<ServiceResult<string>> BatchDelete(string ids)
{
var i = ids.Split(",");
await _WeChatCompanyServices.DeleteByIds(i);
return new MessageModel<string> { success = true };
return new ServiceResult<string> { success = true };
}
}

@ -23,10 +23,10 @@ namespace Tiobon.Core.Controllers
/// <param name="pagination">分页条件</param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<PageModel<WeChatConfig>>> Get([FromQuery] PaginationModel pagination)
public async Task<ServiceResult<PageModel<WeChatConfig>>> Get([FromQuery] PaginationModel pagination)
{
var data = await _WeChatConfigServices.QueryPage(pagination);
return new MessageModel<PageModel<WeChatConfig>> { success = true, response = data};
return new ServiceResult<PageModel<WeChatConfig>> { success = true, response = data};
}
/// <summary>
/// 获取(id)
@ -34,51 +34,51 @@ namespace Tiobon.Core.Controllers
/// <param name="id">主键ID</param>
/// <returns></returns>
[HttpGet("{id}")]
public async Task<MessageModel<WeChatConfig>> Get(string id)
public async Task<ServiceResult<WeChatConfig>> Get(string id)
{
var data = await _WeChatConfigServices.QueryById(id);
return new MessageModel<WeChatConfig> { success = true, response = data };
return new ServiceResult<WeChatConfig> { success = true, response = data };
}
/// <summary>
/// 添加
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<MessageModel<string>> Post([FromBody] WeChatConfig obj)
public async Task<ServiceResult<string>> Post([FromBody] WeChatConfig obj)
{
await _WeChatConfigServices.Add(obj);
return new MessageModel<string> { success = true};
return new ServiceResult<string> { success = true};
}
/// <summary>
/// 更新
/// </summary>
/// <returns></returns>
[HttpPut]
public async Task<MessageModel<string>> Put([FromBody] WeChatConfig obj)
public async Task<ServiceResult<string>> Put([FromBody] WeChatConfig obj)
{
await _WeChatConfigServices.Update(obj);
return new MessageModel<string> { success = true};
return new ServiceResult<string> { success = true};
}
/// <summary>
/// 删除
/// </summary>
/// <returns></returns>
[HttpDelete]
public async Task<MessageModel<string>> Delete(string id)
public async Task<ServiceResult<string>> Delete(string id)
{
await _WeChatConfigServices.DeleteById(id);
return new MessageModel<string> { success = true};
return new ServiceResult<string> { success = true};
}
/// <summary>
/// 批量删除
/// </summary>
/// <returns></returns>
[HttpDelete]
public async Task<MessageModel<string>> BatchDelete(string ids)
public async Task<ServiceResult<string>> BatchDelete(string ids)
{
var i = ids.Split(",");
await _WeChatConfigServices.DeleteByIds(i);
return new MessageModel<string> { success = true };
return new ServiceResult<string> { success = true };
}
}

@ -26,7 +26,7 @@
/// <param name="id"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<WeChatApiDto>> GetToken(string id)
public async Task<ServiceResult<WeChatApiDto>> GetToken(string id)
{
return await _weChatConfigServices.GetToken(id);
@ -37,7 +37,7 @@
/// <param name="id"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<WeChatApiDto>> RefreshToken(string id)
public async Task<ServiceResult<WeChatApiDto>> RefreshToken(string id)
{
return await _weChatConfigServices.RefreshToken(id);
@ -48,7 +48,7 @@
/// <param name="id"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<WeChatApiDto>> GetTemplate(string id)
public async Task<ServiceResult<WeChatApiDto>> GetTemplate(string id)
{
return await _weChatConfigServices.GetTemplate(id);
}
@ -58,7 +58,7 @@
/// <param name="id"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<WeChatApiDto>> GetMenu(string id)
public async Task<ServiceResult<WeChatApiDto>> GetMenu(string id)
{
return await _weChatConfigServices.GetMenu(id);
}
@ -69,7 +69,7 @@
/// <param name="menu"></param>
/// <returns></returns>
[HttpPut]
public async Task<MessageModel<WeChatApiDto>> UpdateMenu(WeChatApiDto menu)
public async Task<ServiceResult<WeChatApiDto>> UpdateMenu(WeChatApiDto menu)
{
return await _weChatConfigServices.UpdateMenu(menu);
}
@ -79,7 +79,7 @@
/// <param name="id"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<WeChatApiDto>> GetSubUsers(string id)
public async Task<ServiceResult<WeChatApiDto>> GetSubUsers(string id)
{
return await _weChatConfigServices.GetSubUsers(id);
}
@ -107,7 +107,7 @@
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<MessageModel<WeChatApiDto>> GetSubUser(string id,string openid)
public async Task<ServiceResult<WeChatApiDto>> GetSubUser(string id,string openid)
{
return await _weChatConfigServices.GetSubUser(id,openid);
}
@ -118,7 +118,7 @@
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<MessageModel<WeChatResponseUserInfo>> GetQRBind([FromQuery]WeChatUserInfo info)
public async Task<ServiceResult<WeChatResponseUserInfo>> GetQRBind([FromQuery]WeChatUserInfo info)
{
return await _weChatConfigServices.GetQRBind(info);
}
@ -129,7 +129,7 @@
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public async Task<MessageModel<WeChatResponseUserInfo>> PushCardMsg(WeChatCardMsgDataDto msg)
public async Task<ServiceResult<WeChatResponseUserInfo>> PushCardMsg(WeChatCardMsgDataDto msg)
{
string pushUserIP = $"{Request.HttpContext.Connection.RemoteIpAddress}:{Request.HttpContext.Connection.RemotePort}";
return await _weChatConfigServices.PushCardMsg(msg, pushUserIP);
@ -141,7 +141,7 @@
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<MessageModel<WeChatResponseUserInfo>> PushCardMsgGet([FromQuery] WeChatCardMsgDataDto msg)
public async Task<ServiceResult<WeChatResponseUserInfo>> PushCardMsgGet([FromQuery] WeChatCardMsgDataDto msg)
{
string pushUserIP = $"{Request.HttpContext.Connection.RemoteIpAddress}:{Request.HttpContext.Connection.RemotePort}";
return await _weChatConfigServices.PushCardMsg(msg, pushUserIP);
@ -153,7 +153,7 @@
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public async Task<MessageModel<WeChatApiDto>> PushTxtMsg([FromBody] WeChatPushTestDto msg)
public async Task<ServiceResult<WeChatApiDto>> PushTxtMsg([FromBody] WeChatPushTestDto msg)
{
return await _weChatConfigServices.PushTxtMsg(msg);
}
@ -164,7 +164,7 @@
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<MessageModel<WeChatResponseUserInfo>> GetBindUserInfo([FromQuery]WeChatUserInfo info)
public async Task<ServiceResult<WeChatResponseUserInfo>> GetBindUserInfo([FromQuery]WeChatUserInfo info)
{
return await _weChatConfigServices.GetBindUserInfo(info);
}
@ -175,7 +175,7 @@
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<MessageModel<WeChatResponseUserInfo>> UnBind([FromQuery]WeChatUserInfo info)
public async Task<ServiceResult<WeChatResponseUserInfo>> UnBind([FromQuery]WeChatUserInfo info)
{
return await _weChatConfigServices.UnBind(info);
}

@ -23,10 +23,10 @@ namespace Tiobon.Core.Controllers
/// <param name="pagination">分页条件</param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<PageModel<WeChatPushLog>>> Get([FromQuery] PaginationModel pagination)
public async Task<ServiceResult<PageModel<WeChatPushLog>>> Get([FromQuery] PaginationModel pagination)
{
var data = await _WeChatPushLogServices.QueryPage(pagination);
return new MessageModel<PageModel<WeChatPushLog>> { success = true, response = data};
return new ServiceResult<PageModel<WeChatPushLog>> { success = true, response = data};
}
/// <summary>
/// 获取(id)
@ -34,51 +34,51 @@ namespace Tiobon.Core.Controllers
/// <param name="id">主键ID</param>
/// <returns></returns>
[HttpGet("{id}")]
public async Task<MessageModel<WeChatPushLog>> Get(string id)
public async Task<ServiceResult<WeChatPushLog>> Get(string id)
{
var data = await _WeChatPushLogServices.QueryById(id);
return new MessageModel<WeChatPushLog> { success = true, response = data };
return new ServiceResult<WeChatPushLog> { success = true, response = data };
}
/// <summary>
/// 添加
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<MessageModel<string>> Post([FromBody] WeChatPushLog obj)
public async Task<ServiceResult<string>> Post([FromBody] WeChatPushLog obj)
{
await _WeChatPushLogServices.Add(obj);
return new MessageModel<string> { success = true};
return new ServiceResult<string> { success = true};
}
/// <summary>
/// 更新
/// </summary>
/// <returns></returns>
[HttpPut]
public async Task<MessageModel<string>> Put([FromBody] WeChatPushLog obj)
public async Task<ServiceResult<string>> Put([FromBody] WeChatPushLog obj)
{
await _WeChatPushLogServices.Update(obj);
return new MessageModel<string> { success = true};
return new ServiceResult<string> { success = true};
}
/// <summary>
/// 删除
/// </summary>
/// <returns></returns>
[HttpDelete]
public async Task<MessageModel<string>> Delete(string id)
public async Task<ServiceResult<string>> Delete(string id)
{
await _WeChatPushLogServices.DeleteById(id);
return new MessageModel<string> { success = true};
return new ServiceResult<string> { success = true};
}
/// <summary>
/// 批量删除
/// </summary>
/// <returns></returns>
[HttpDelete]
public async Task<MessageModel<string>> BatchDelete(string ids)
public async Task<ServiceResult<string>> BatchDelete(string ids)
{
var i = ids.Split(",");
await _WeChatPushLogServices.DeleteByIds(i);
return new MessageModel<string> { success = true };
return new ServiceResult<string> { success = true };
}
}

@ -23,10 +23,10 @@ namespace Tiobon.Core.Controllers
/// <param name="pagination">分页条件</param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<PageModel<WeChatSub>>> Get([FromQuery] PaginationModel pagination)
public async Task<ServiceResult<PageModel<WeChatSub>>> Get([FromQuery] PaginationModel pagination)
{
var data = await _WeChatSubServices.QueryPage(pagination);
return new MessageModel<PageModel<WeChatSub>> { success = true, response = data};
return new ServiceResult<PageModel<WeChatSub>> { success = true, response = data};
}
/// <summary>
/// 获取(id)
@ -34,51 +34,51 @@ namespace Tiobon.Core.Controllers
/// <param name="id">主键ID</param>
/// <returns></returns>
[HttpGet("{id}")]
public async Task<MessageModel<WeChatSub>> Get(string id)
public async Task<ServiceResult<WeChatSub>> Get(string id)
{
var data = await _WeChatSubServices.QueryById(id);
return new MessageModel<WeChatSub> { success = true, response = data };
return new ServiceResult<WeChatSub> { success = true, response = data };
}
/// <summary>
/// 添加
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<MessageModel<string>> Post([FromBody] WeChatSub obj)
public async Task<ServiceResult<string>> Post([FromBody] WeChatSub obj)
{
await _WeChatSubServices.Add(obj);
return new MessageModel<string> { success = true};
return new ServiceResult<string> { success = true};
}
/// <summary>
/// 更新
/// </summary>
/// <returns></returns>
[HttpPut]
public async Task<MessageModel<string>> Put([FromBody] WeChatSub obj)
public async Task<ServiceResult<string>> Put([FromBody] WeChatSub obj)
{
await _WeChatSubServices.Update(obj);
return new MessageModel<string> { success = true};
return new ServiceResult<string> { success = true};
}
/// <summary>
/// 删除
/// </summary>
/// <returns></returns>
[HttpDelete]
public async Task<MessageModel<string>> Delete(string id)
public async Task<ServiceResult<string>> Delete(string id)
{
await _WeChatSubServices.DeleteById(id);
return new MessageModel<string> { success = true};
return new ServiceResult<string> { success = true};
}
/// <summary>
/// 批量删除
/// </summary>
/// <returns></returns>
[HttpDelete]
public async Task<MessageModel<string>> BatchDelete(string ids)
public async Task<ServiceResult<string>> BatchDelete(string ids)
{
var i = ids.Split(",");
await _WeChatSubServices.DeleteByIds(i);
return new MessageModel<string> { success = true };
return new ServiceResult<string> { success = true };
}
}

@ -1,5 +1,6 @@
using Microsoft.AspNetCore.Mvc.Filters;
using System.Security.Claims;
using Tiobon.Core.Model;
namespace Tiobon.Core.Api.Filter
{
@ -32,7 +33,7 @@ namespace Tiobon.Core.Api.Filter
}
}
}
filterContext.Result = new JsonResult(MessageModel.Fail($"参数验证失败:{msg}"));
filterContext.Result = new JsonResult(ServiceResult.OprateFailed($"参数验证失败:{msg}"));
return;
}
@ -232,18 +233,18 @@ namespace Tiobon.Core.Api.Filter
}
}
error += $":{sb.ToString()}";
filterContext.Result = new JsonResult(MessageModel.Fail($"请求的数据类型不正确:{error}"));
filterContext.Result = new JsonResult(ServiceResult.OprateFailed($"请求的数据类型不正确:{error}"));
}
else
{
filterContext.Result = new JsonResult(MessageModel.Fail(error));
filterContext.Result = new JsonResult(ServiceResult.OprateFailed(error));
}
//LoggerHelper.SendLog(error);
return;
}
if (filterContext.Result is ObjectResult objectResult && objectResult.Value == null)
{
filterContext.Result = new JsonResult(MessageModel.Success("查询成功"));
filterContext.Result = new JsonResult(ServiceResult.OprateSuccess("查询成功"));
}
base.OnResultExecuting(filterContext);

@ -23,7 +23,7 @@ namespace Tiobon.Core.Filter
public void OnException(ExceptionContext context)
{
var json = new MessageModel<string>();
var json = new ServiceResult<string>();
json.msg = context.Exception.Message;//错误信息
json.status = 500;//500异常
@ -38,7 +38,7 @@ namespace Tiobon.Core.Filter
json.msgDev = context.Exception.StackTrace;//堆栈信息
}
var res = new ContentResult();
res.Content = JsonHelper.GetJSON<MessageModel<string>>(json);
res.Content = JsonHelper.GetJSON<ServiceResult<string>>(json);
context.Result = res;

@ -1956,110 +1956,6 @@
年龄
</summary>
</member>
<member name="T:Tiobon.Core.Model.MessageModel`1">
<summary>
通用返回信息类
</summary>
</member>
<member name="P:Tiobon.Core.Model.MessageModel`1.status">
<summary>
状态码
</summary>
</member>
<member name="P:Tiobon.Core.Model.MessageModel`1.success">
<summary>
操作是否成功
</summary>
</member>
<member name="P:Tiobon.Core.Model.MessageModel`1.msg">
<summary>
返回信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.MessageModel`1.msgDev">
<summary>
开发者信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.MessageModel`1.response">
<summary>
返回数据集合
</summary>
</member>
<member name="M:Tiobon.Core.Model.MessageModel`1.Success(System.String)">
<summary>
返回成功
</summary>
<param name="msg">消息</param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Model.MessageModel`1.Success(System.String,`0)">
<summary>
返回成功
</summary>
<param name="msg">消息</param>
<param name="response">数据</param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Model.MessageModel`1.Fail(System.String)">
<summary>
返回失败
</summary>
<param name="msg">消息</param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Model.MessageModel`1.Fail(System.String,`0)">
<summary>
返回失败
</summary>
<param name="msg">消息</param>
<param name="response">数据</param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Model.MessageModel`1.Message(System.Boolean,System.String,`0)">
<summary>
返回消息
</summary>
<param name="success">失败/成功</param>
<param name="msg">消息</param>
<param name="response">数据</param>
<returns></returns>
</member>
<member name="P:Tiobon.Core.Model.MessageModel.status">
<summary>
状态码
</summary>
</member>
<member name="P:Tiobon.Core.Model.MessageModel.success">
<summary>
操作是否成功
</summary>
</member>
<member name="P:Tiobon.Core.Model.MessageModel.msg">
<summary>
返回信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.MessageModel.response">
<summary>
返回数据集合
</summary>
</member>
<member name="M:Tiobon.Core.Model.MessageModel.Success(System.String)">
<summary>
操作成功
</summary>
<param name="msg"></param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Model.MessageModel.Fail(System.String,System.Int32)">
<summary>
操作失败
</summary>
<param name="msg"></param>
<param name="status"></param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Model.DepartmentRoot`1">
<summary>
部门表
@ -2227,6 +2123,115 @@
找不到指定资源
</summary>
</member>
<member name="T:Tiobon.Core.Model.ServiceResult`1">
<summary>
服务层响应实体(泛型)
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServiceResult`1.status">
<summary>
状态码
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServiceResult`1.success">
<summary>
操作是否成功
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServiceResult`1.msg">
<summary>
返回信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServiceResult`1.msgDev">
<summary>
开发者信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServiceResult`1.response">
<summary>
返回数据集合
</summary>
</member>
<member name="M:Tiobon.Core.Model.ServiceResult`1.OprateSuccess(System.String)">
<summary>
返回成功
</summary>
<param name="msg">消息</param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Model.ServiceResult`1.OprateSuccess(System.String,`0)">
<summary>
返回成功
</summary>
<param name="msg">消息</param>
<param name="response">数据</param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Model.ServiceResult`1.Fail(System.String)">
<summary>
返回失败
</summary>
<param name="msg">消息</param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Model.ServiceResult`1.Fail(System.String,`0)">
<summary>
返回失败
</summary>
<param name="msg">消息</param>
<param name="response">数据</param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Model.ServiceResult`1.Message(System.Boolean,System.String,`0)">
<summary>
返回消息
</summary>
<param name="success">失败/成功</param>
<param name="msg">消息</param>
<param name="response">数据</param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Model.ServiceResult">
<summary>
服务层响应实体
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServiceResult.status">
<summary>
状态码
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServiceResult.success">
<summary>
操作是否成功
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServiceResult.msg">
<summary>
返回信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.ServiceResult.response">
<summary>
返回数据集合
</summary>
</member>
<member name="M:Tiobon.Core.Model.ServiceResult.OprateSuccess(System.String)">
<summary>
操作成功
</summary>
<param name="msg"></param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Model.ServiceResult.OprateFailed(System.String,System.Int32)">
<summary>
操作失败
</summary>
<param name="msg"></param>
<param name="status"></param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Model.Systems.DataBase.DataBaseReadType">
<summary>
数据库读取类型

@ -68,38 +68,38 @@ namespace Tiobon.Core.Common
/// <param name="bindingContext"></param>
private static void SetPredicateValues(QueryFilter queryFilter, ModelBindingContext bindingContext)
{
if (queryFilter?.PredicateValues == null || queryFilter.PredicateValues.Length == 0)
{
return;
}
//if (queryFilter?.PredicateValues == null || queryFilter.PredicateValues.Length == 0)
//{
// return;
//}
for (int i = 0; i < queryFilter.PredicateValues.Length; i++)
{
if (queryFilter.PredicateValues[i] is JObject jObj)
{
var prop = jObj.Properties()?.FirstOrDefault();
if (prop == null)
continue;
var type = StringConvertToType(prop.Name);
if (type == null)
continue;
try
{
var v = JsonConvert.DeserializeObject(prop.Value?.ToString(), type);
if (v != null)
{
queryFilter.PredicateValues[i] = v;
}
}
catch (Exception)
{
throw;
//LoggerHelper.SendLogError($"QueryFilter.PredicateValues[{i}] [{queryFilter.PredicateValues[i]}] 反序列化失败\r\n" +
// $"请求地址: {bindingContext.HttpContext.Request.GetEncodedUrl()}\r\n" +
// $"错误信息: {ex}");
}
}
}
//for (int i = 0; i < queryFilter.PredicateValues.Length; i++)
//{
// if (queryFilter.PredicateValues[i] is JObject jObj)
// {
// var prop = jObj.Properties()?.FirstOrDefault();
// if (prop == null)
// continue;
// var type = StringConvertToType(prop.Name);
// if (type == null)
// continue;
// try
// {
// var v = JsonConvert.DeserializeObject(prop.Value?.ToString(), type);
// if (v != null)
// {
// queryFilter.PredicateValues[i] = v;
// }
// }
// catch (Exception)
// {
// throw;
// //LoggerHelper.SendLogError($"QueryFilter.PredicateValues[{i}] [{queryFilter.PredicateValues[i]}] 反序列化失败\r\n" +
// // $"请求地址: {bindingContext.HttpContext.Request.GetEncodedUrl()}\r\n" +
// // $"错误信息: {ex}");
// }
// }
//}
}

@ -98,7 +98,7 @@ namespace Tiobon.Core.Common.HttpContextUser
return new List<string>() { };
}
public MessageModel<string> MessageModel { get; set; }
public ServiceResult<string> MessageModel { get; set; }
public IEnumerable<Claim> GetClaimsIdentity()
{

@ -16,6 +16,6 @@ namespace Tiobon.Core.Common.HttpContextUser
string GetToken();
List<string> GetUserInfoFromToken(string ClaimType);
MessageModel<string> MessageModel { get; set; }
ServiceResult<string> MessageModel { get; set; }
}
}

@ -163,10 +163,10 @@ namespace Tiobon.Core.Common.Seed
/// <param name=""filter"">条件</param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<PageModel<{ClassName}Dto>>> Get([FromFilter] QueryFilter filter)
public async Task<ServiceResult<PageModel<{ClassName}Dto>>> Get([FromFilter] QueryFilter filter)
{
var response = await _{ClassName}Services.QueryFilterPage(filter);
return new MessageModel<PageModel<{ClassName}Dto>>() { msg = """", success = true, response = response };
return new ServiceResult<PageModel<{ClassName}Dto>>() { msg = """", success = true, response = response };
}
/// <summary>
@ -175,13 +175,13 @@ namespace Tiobon.Core.Common.Seed
/// <param name=""Id"">主键ID</param>
/// <returns></returns>
[HttpGet(""{Id}"")]
public async Task<MessageModel<{ClassName}Dto>> Get(string Id)
public async Task<ServiceResult<{ClassName}Dto>> Get(string Id)
{
var entity = await _{ClassName}Services.QueryById(Id);
if (entity == null)
return MessageModel<{ClassName}Dto>.Fail("""");
return ServiceResult<{ClassName}Dto>.Fail("""");
else
return new MessageModel<{ClassName}Dto>() { msg = """", success = true, response = entity };
return new ServiceResult<{ClassName}Dto>() { msg = """", success = true, response = entity };
}
#endregion
@ -192,9 +192,9 @@ namespace Tiobon.Core.Common.Seed
/// <param name=""insertModel""></param>
/// <returns></returns>
[HttpPost]
public async Task<MessageModel<string>> Post([FromBody] Insert{ClassName}Input insertModel)
public async Task<ServiceResult<string>> Post([FromBody] Insert{ClassName}Input insertModel)
{
var data = MessageModel<string>.Success("""", null);
var data = ServiceResult<string>.Success("""", null);
var id = await _{ClassName}Services.Add(insertModel);
data.success = id > 0;
@ -213,7 +213,7 @@ namespace Tiobon.Core.Common.Seed
/// <param name=""editModel""></param>
/// <returns></returns>
[HttpPut(""{Id}"")]
public async Task<MessageModel> Put(long Id, [FromBody] Edit{ClassName}Input editModel)
public async Task<ServiceResult> Put(long Id, [FromBody] Edit{ClassName}Input editModel)
{
var data = MessageModel.Success("""");
data.success = await _{ClassName}Services.Update(Id, editModel);
@ -231,7 +231,7 @@ namespace Tiobon.Core.Common.Seed
/// <param name=""Id""></param>
/// <returns></returns>
[HttpDelete(""{Id}"")]
public async Task<MessageModel> Delete(long Id)
public async Task<ServiceResult> Delete(long Id)
{
var data = MessageModel.Success("""");
var entity = await _{ClassName}Services.QueryById(Id);

@ -19,9 +19,9 @@ namespace Tiobon.Core.Gateway.Controllers
}
[HttpGet]
public MessageModel<List<ClaimDto>> MyClaims()
public ServiceResult<List<ClaimDto>> MyClaims()
{
return new MessageModel<List<ClaimDto>>()
return new ServiceResult<List<ClaimDto>>()
{
success = true,
response = (_user.GetClaimsIdentity().ToList()).Select(d =>

@ -7,7 +7,7 @@ namespace Tiobon.Core.IServices
{
public partial interface IGuestbookServices : IBaseServices<Guestbook>
{
Task<MessageModel<string>> TestTranInRepository();
Task<ServiceResult<string>> TestTranInRepository();
Task<bool> TestTranInRepositoryAOP();
Task<bool> TestTranPropagation();

@ -15,20 +15,20 @@ namespace Tiobon.Core.IServices
/// 被扫支付
/// </summary>
/// <returns></returns>
Task<MessageModel<PayReturnResultModel>> Pay(PayNeedModel payModel);
Task<ServiceResult<PayReturnResultModel>> Pay(PayNeedModel payModel);
/// <summary>
/// 退款
/// </summary>
/// <param name="payModel"></param>
/// <returns></returns>
Task<MessageModel<PayRefundReturnResultModel>> PayRefund(PayRefundNeedModel payModel);
Task<ServiceResult<PayRefundReturnResultModel>> PayRefund(PayRefundNeedModel payModel);
/// <summary>
/// 轮询查询
/// </summary>
/// <param name="payModel"></param>
/// <param name="times">轮询次数</param>
/// <returns></returns>
Task<MessageModel<PayReturnResultModel>> PayCheck(PayNeedModel payModel,int times);
Task<ServiceResult<PayReturnResultModel>> PayCheck(PayNeedModel payModel,int times);
/// <summary>
/// 验证签名
/// </summary>

@ -16,37 +16,37 @@ namespace Tiobon.Core.IServices
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
Task<MessageModel<WeChatApiDto>> GetToken(string id);
Task<ServiceResult<WeChatApiDto>> GetToken(string id);
/// <summary>
/// 刷新微信token
/// </summary>
/// <param name="publicAccount"></param>
/// <returns></returns>
Task<MessageModel<WeChatApiDto>> RefreshToken(string id);
Task<ServiceResult<WeChatApiDto>> RefreshToken(string id);
/// <summary>
/// 获取模板信息
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
Task<MessageModel<WeChatApiDto>> GetTemplate(string id);
Task<ServiceResult<WeChatApiDto>> GetTemplate(string id);
/// <summary>
/// 获取菜单
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
Task<MessageModel<WeChatApiDto>> GetMenu(string id);
Task<ServiceResult<WeChatApiDto>> GetMenu(string id);
/// <summary>
/// 获取订阅用户
/// </summary>
/// <param name="id"></param>
/// <param name="openid"></param>
/// <returns></returns>
Task<MessageModel<WeChatApiDto>> GetSubUser(string id,string openid);
Task<ServiceResult<WeChatApiDto>> GetSubUser(string id,string openid);
/// <summary>
/// 获取订阅用户列表
/// </summary>
/// <returns></returns>
Task<MessageModel<WeChatApiDto>> GetSubUsers(string id);
Task<ServiceResult<WeChatApiDto>> GetSubUsers(string id);
/// <summary>
/// 处理微信事件
/// </summary>
@ -66,37 +66,37 @@ namespace Tiobon.Core.IServices
/// </summary>
/// <param name="info"></param>
/// <returns></returns>
Task<MessageModel<WeChatResponseUserInfo>> GetQRBind(WeChatUserInfo info);
Task<ServiceResult<WeChatResponseUserInfo>> GetQRBind(WeChatUserInfo info);
/// <summary>
/// 推送卡片消息(绑定用户)
/// </summary>
/// <param name="msg"></param>
/// <param name="ip"></param>
/// <returns></returns>
Task<MessageModel<WeChatResponseUserInfo>> PushCardMsg(WeChatCardMsgDataDto msg,string ip);
Task<ServiceResult<WeChatResponseUserInfo>> PushCardMsg(WeChatCardMsgDataDto msg,string ip);
/// <summary>
/// 推送文本消息(绑定或订阅)
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
Task<MessageModel<WeChatApiDto>> PushTxtMsg(WeChatPushTestDto msg);
Task<ServiceResult<WeChatApiDto>> PushTxtMsg(WeChatPushTestDto msg);
/// <summary>
/// 更新菜单
/// </summary>
/// <param name="menu"></param>
/// <returns></returns>
Task<MessageModel<WeChatApiDto>> UpdateMenu(WeChatApiDto menu);
Task<ServiceResult<WeChatApiDto>> UpdateMenu(WeChatApiDto menu);
/// <summary>
/// 通过绑定用户获取微信用户信息
/// </summary>
/// <param name="info"></param>
/// <returns></returns>
Task<MessageModel<WeChatResponseUserInfo>> GetBindUserInfo(WeChatUserInfo info);
Task<ServiceResult<WeChatResponseUserInfo>> GetBindUserInfo(WeChatUserInfo info);
/// <summary>
/// 解除绑定用户
/// </summary>
/// <param name="info"></param>
/// <returns></returns>
Task<MessageModel<WeChatResponseUserInfo>> UnBind(WeChatUserInfo info);
Task<ServiceResult<WeChatResponseUserInfo>> UnBind(WeChatUserInfo info);
}
}

@ -4,7 +4,7 @@
{
public int Status { get; set; } = 200;
public string Value { get; set; } = "";
public MessageModel<string> MessageModel = new MessageModel<string>() { };
public ServiceResult<string> MessageModel = new ServiceResult<string>() { };
public ApiResponse(StatusCode apiCode, string msg = null)
{
@ -36,7 +36,7 @@
break;
}
MessageModel = new MessageModel<string>()
MessageModel = new ServiceResult<string>()
{
status = Status,
msg = Value,

@ -1,130 +0,0 @@
namespace Tiobon.Core.Model
{
/// <summary>
/// 通用返回信息类
/// </summary>
public class MessageModel<T>
{
/// <summary>
/// 状态码
/// </summary>
public int status { get; set; } = 200;
/// <summary>
/// 操作是否成功
/// </summary>
public bool success { get; set; } = false;
/// <summary>
/// 返回信息
/// </summary>
public string msg { get; set; } = "";
/// <summary>
/// 开发者信息
/// </summary>
public string msgDev { get; set; }
/// <summary>
/// 返回数据集合
/// </summary>
public T response { get; set; }
/// <summary>
/// 返回成功
/// </summary>
/// <param name="msg">消息</param>
/// <returns></returns>
public static MessageModel<T> Success(string msg)
{
return Message(true, msg, default);
}
/// <summary>
/// 返回成功
/// </summary>
/// <param name="msg">消息</param>
/// <param name="response">数据</param>
/// <returns></returns>
public static MessageModel<T> Success(string msg, T response)
{
return Message(true, msg, response);
}
/// <summary>
/// 返回失败
/// </summary>
/// <param name="msg">消息</param>
/// <returns></returns>
public static MessageModel<T> Fail(string msg)
{
return Message(false, msg, default);
}
/// <summary>
/// 返回失败
/// </summary>
/// <param name="msg">消息</param>
/// <param name="response">数据</param>
/// <returns></returns>
public static MessageModel<T> Fail(string msg, T response)
{
return Message(false, msg, response);
}
/// <summary>
/// 返回消息
/// </summary>
/// <param name="success">失败/成功</param>
/// <param name="msg">消息</param>
/// <param name="response">数据</param>
/// <returns></returns>
public static MessageModel<T> Message(bool success, string msg, T response)
{
return new MessageModel<T>() { msg = msg, response = response, success = success };
}
}
public class MessageModel
{
/// <summary>
/// 状态码
/// </summary>
public int status { get; set; } = 200;
/// <summary>
/// 操作是否成功
/// </summary>
public bool success { get; set; } = false;
/// <summary>
/// 返回信息
/// </summary>
public string msg { get; set; } = "";
/// <summary>
/// 返回数据集合
/// </summary>
public object response { get; set; }
/// <summary>
/// 操作成功
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
public static MessageModel Success(string msg = "操作成功")
{
return new MessageModel
{
msg = msg,
success = true,
response = null
};
}
/// <summary>
/// 操作失败
/// </summary>
/// <param name="msg"></param>
/// <param name="status"></param>
/// <returns></returns>
public static MessageModel Fail(string msg = "操作失败", int status = 500)
{
return new MessageModel
{
msg = msg,
status = status,
response = null
};
}
}
}

@ -0,0 +1,133 @@
namespace Tiobon.Core.Model;
/// <summary>
/// 服务层响应实体(泛型)
/// </summary>
public class ServiceResult<T>
{
/// <summary>
/// 状态码
/// </summary>
public int status { get; set; } = 200;
/// <summary>
/// 操作是否成功
/// </summary>
public bool success { get; set; } = false;
/// <summary>
/// 返回信息
/// </summary>
public string msg { get; set; } = "";
/// <summary>
/// 开发者信息
/// </summary>
public string msgDev { get; set; }
/// <summary>
/// 返回数据集合
/// </summary>
public T response { get; set; }
/// <summary>
/// 返回成功
/// </summary>
/// <param name="msg">消息</param>
/// <returns></returns>
public static ServiceResult<T> OprateSuccess(string msg)
{
return Message(true, msg, default);
}
/// <summary>
/// 返回成功
/// </summary>
/// <param name="msg">消息</param>
/// <param name="response">数据</param>
/// <returns></returns>
public static ServiceResult<T> OprateSuccess(string msg, T response)
{
return Message(true, msg, response);
}
/// <summary>
/// 返回失败
/// </summary>
/// <param name="msg">消息</param>
/// <returns></returns>
public static ServiceResult<T> Fail(string msg)
{
return Message(false, msg, default);
}
/// <summary>
/// 返回失败
/// </summary>
/// <param name="msg">消息</param>
/// <param name="response">数据</param>
/// <returns></returns>
public static ServiceResult<T> Fail(string msg, T response)
{
return Message(false, msg, response);
}
/// <summary>
/// 返回消息
/// </summary>
/// <param name="success">失败/成功</param>
/// <param name="msg">消息</param>
/// <param name="response">数据</param>
/// <returns></returns>
public static ServiceResult<T> Message(bool success, string msg, T response)
{
return new ServiceResult<T>() { msg = msg, response = response, success = success };
}
}
/// <summary>
/// 服务层响应实体
/// </summary>
public class ServiceResult
{
/// <summary>
/// 状态码
/// </summary>
public int status { get; set; } = 200;
/// <summary>
/// 操作是否成功
/// </summary>
public bool success { get; set; } = false;
/// <summary>
/// 返回信息
/// </summary>
public string msg { get; set; } = "";
/// <summary>
/// 返回数据集合
/// </summary>
public object response { get; set; }
/// <summary>
/// 操作成功
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
public static ServiceResult OprateSuccess(string msg = "操作成功")
{
return new ServiceResult
{
msg = msg,
success = true,
response = null
};
}
/// <summary>
/// 操作失败
/// </summary>
/// <param name="msg"></param>
/// <param name="status"></param>
/// <returns></returns>
public static ServiceResult OprateFailed(string msg = "操作失败", int status = 500)
{
return new ServiceResult
{
msg = msg,
status = status,
response = null
};
}
}

@ -25,7 +25,7 @@ namespace Tiobon.Core.Services
_passwordLibServices = passwordLibServices;
}
public async Task<MessageModel<string>> TestTranInRepository()
public async Task<ServiceResult<string>> TestTranInRepository()
{
try
{
@ -72,7 +72,7 @@ namespace Tiobon.Core.Services
uow.Commit();
}
return new MessageModel<string>()
return new ServiceResult<string>()
{
success = true,
msg = "操作完成"
@ -86,7 +86,7 @@ namespace Tiobon.Core.Services
var guestbooks = await BaseDal.Query();
Console.WriteLine($"third time : the count of guestbooks is :{guestbooks.Count}");
return new MessageModel<string>()
return new ServiceResult<string>()
{
success = false,
msg = "操作异常"

@ -28,10 +28,10 @@ namespace Tiobon.Core.Services
_httpContextAccessor = httpContextAccessor;
}
public async Task<MessageModel<PayReturnResultModel>> Pay(PayNeedModel payModel)
public async Task<ServiceResult<PayReturnResultModel>> Pay(PayNeedModel payModel)
{
_logger.LogInformation("支付开始");
MessageModel<PayReturnResultModel> messageModel = new MessageModel<PayReturnResultModel>();
ServiceResult<PayReturnResultModel> messageModel = new ServiceResult<PayReturnResultModel>();
messageModel.response = new PayReturnResultModel();
string url = string.Empty;
string param = string.Empty;
@ -173,15 +173,15 @@ namespace Tiobon.Core.Services
}
finally
{
_logger.LogInformation($"返回数据->{JsonHelper.GetJSON<MessageModel<PayReturnResultModel>>(messageModel)}");
_logger.LogInformation($"返回数据->{JsonHelper.GetJSON<ServiceResult<PayReturnResultModel>>(messageModel)}");
_logger.LogInformation("支付结束");
}
return messageModel;
}
public async Task<MessageModel<PayRefundReturnResultModel>> PayRefund(PayRefundNeedModel payModel)
public async Task<ServiceResult<PayRefundReturnResultModel>> PayRefund(PayRefundNeedModel payModel)
{
_logger.LogInformation("退款开始");
MessageModel<PayRefundReturnResultModel> messageModel = new MessageModel<PayRefundReturnResultModel>();
ServiceResult<PayRefundReturnResultModel> messageModel = new ServiceResult<PayRefundReturnResultModel>();
messageModel.response = new PayRefundReturnResultModel();
try
{
@ -253,18 +253,18 @@ namespace Tiobon.Core.Services
}
finally
{
_logger.LogInformation($"返回数据->{JsonHelper.GetJSON<MessageModel<PayRefundReturnResultModel>>(messageModel)}");
_logger.LogInformation($"返回数据->{JsonHelper.GetJSON<ServiceResult<PayRefundReturnResultModel>>(messageModel)}");
_logger.LogInformation("退款结束");
}
return messageModel;
}
public async Task<MessageModel<PayReturnResultModel>> PayCheck(PayNeedModel payModel, int times)
public async Task<ServiceResult<PayReturnResultModel>> PayCheck(PayNeedModel payModel, int times)
{
_logger.LogInformation("轮询开始");
MessageModel<PayReturnResultModel> messageModel = new MessageModel<PayReturnResultModel>();
ServiceResult<PayReturnResultModel> messageModel = new ServiceResult<PayReturnResultModel>();
messageModel.response = new PayReturnResultModel();
string url = string.Empty;
string param = string.Empty;
@ -400,7 +400,7 @@ namespace Tiobon.Core.Services
}
finally
{
_logger.LogInformation($"返回数据->{JsonHelper.GetJSON<MessageModel<PayReturnResultModel>>(messageModel)}");
_logger.LogInformation($"返回数据->{JsonHelper.GetJSON<ServiceResult<PayReturnResultModel>>(messageModel)}");
_logger.LogInformation("轮序结束");
}
return messageModel;

@ -26,16 +26,16 @@ namespace Tiobon.Core.Services
this._unitOfWorkManage = unitOfWorkManage;
this._logger = logger;
}
public async Task<MessageModel<WeChatApiDto>> GetToken(string publicAccount)
public async Task<ServiceResult<WeChatApiDto>> GetToken(string publicAccount)
{
var config = await this.QueryById(publicAccount);
if (config == null) MessageModel<string>.Success($"公众号{publicAccount}未维护至系统");//还没过期,直接返回
if (config == null) ServiceResult<string>.OprateSuccess($"公众号{publicAccount}未维护至系统");//还没过期,直接返回
if (config.tokenExpiration > DateTime.Now)
{
//再次判断token在微信服务器是否正确
var wechatIP = await WeChatHelper.GetWechatIP(config.token);
if (wechatIP.errcode == 0)
MessageModel<WeChatApiDto>.Success("", new WeChatApiDto { access_token = config.token });//还没过期,直接返回
ServiceResult<WeChatApiDto>.OprateSuccess("", new WeChatApiDto { access_token = config.token });//还没过期,直接返回
}
//过期了,重新获取
var data = await WeChatHelper.GetToken(config.appid, config.appsecret);
@ -44,17 +44,17 @@ namespace Tiobon.Core.Services
config.token = data.access_token;
config.tokenExpiration = DateTime.Now.AddSeconds(data.expires_in);
await this.Update(config);
return MessageModel<WeChatApiDto>.Success("",data);
return ServiceResult<WeChatApiDto>.OprateSuccess("",data);
}
else
{
return MessageModel<WeChatApiDto>.Fail($"\r\n获取Token失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}");
return ServiceResult<WeChatApiDto>.Fail($"\r\n获取Token失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}");
}
}
public async Task<MessageModel<WeChatApiDto>> RefreshToken(string publicAccount)
public async Task<ServiceResult<WeChatApiDto>> RefreshToken(string publicAccount)
{
var config = await this.QueryById(publicAccount);
if (config == null) MessageModel<string>.Success($"公众号{publicAccount}未维护至系统");//还没过期,直接返回
if (config == null) ServiceResult<string>.OprateSuccess($"公众号{publicAccount}未维护至系统");//还没过期,直接返回
//过期了,重新获取
var data = await WeChatHelper.GetToken(config.appid, config.appsecret);
if (data.errcode.Equals(0))
@ -62,25 +62,25 @@ namespace Tiobon.Core.Services
config.token = data.access_token;
config.tokenExpiration = DateTime.Now.AddSeconds(data.expires_in);
await this.Update(config);
return MessageModel<WeChatApiDto>.Success("", data);
return ServiceResult<WeChatApiDto>.OprateSuccess("", data);
}
else
{
return MessageModel<WeChatApiDto>.Fail($"\r\n获取Token失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}");
return ServiceResult<WeChatApiDto>.Fail($"\r\n获取Token失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}");
}
}
public async Task<MessageModel<WeChatApiDto>> GetTemplate(string id)
public async Task<ServiceResult<WeChatApiDto>> GetTemplate(string id)
{
var res = await GetToken(id);
if (!res.success) return res;
var data = await WeChatHelper.GetTemplate(res.response.access_token);
if (data.errcode.Equals(0))
{
return MessageModel<WeChatApiDto>.Success("", data);
return ServiceResult<WeChatApiDto>.OprateSuccess("", data);
}
else
{
return MessageModel<WeChatApiDto>.Success($"\r\n获取模板失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}", data);
return ServiceResult<WeChatApiDto>.OprateSuccess($"\r\n获取模板失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}", data);
}
}
/// <summary>
@ -88,21 +88,21 @@ namespace Tiobon.Core.Services
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public async Task<MessageModel<WeChatApiDto>> GetMenu(string id)
public async Task<ServiceResult<WeChatApiDto>> GetMenu(string id)
{
var res = await GetToken(id);
if (!res.success) return res;
var data = await WeChatHelper.GetMenu(res.response.access_token);
if (data.errcode.Equals(0))
{
return MessageModel<WeChatApiDto>.Success("", data);
return ServiceResult<WeChatApiDto>.OprateSuccess("", data);
}
else
{
return MessageModel<WeChatApiDto>.Success($"\r\n获取菜单失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}", data);
return ServiceResult<WeChatApiDto>.OprateSuccess($"\r\n获取菜单失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}", data);
}
}
public async Task<MessageModel<WeChatApiDto>> GetSubUsers(string id)
public async Task<ServiceResult<WeChatApiDto>> GetSubUsers(string id)
{
var res = await GetToken(id);
if (!res.success) return res;
@ -114,25 +114,25 @@ namespace Tiobon.Core.Services
{
data.users.Add(await WeChatHelper.GetUserInfo(res.response.access_token, openid));
}
return MessageModel<WeChatApiDto>.Success("", data);
return ServiceResult<WeChatApiDto>.OprateSuccess("", data);
}
else
{
return MessageModel<WeChatApiDto>.Success($"\r\n获取订阅用户失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}", data);
return ServiceResult<WeChatApiDto>.OprateSuccess($"\r\n获取订阅用户失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}", data);
}
}
public async Task<MessageModel<WeChatApiDto>> GetSubUser(string id,string openid)
public async Task<ServiceResult<WeChatApiDto>> GetSubUser(string id,string openid)
{
var res = await GetToken(id);
if (!res.success) return res;
var data = await WeChatHelper.GetUserInfo(res.response.access_token,openid);
if (data.errcode.Equals(0))
{
return MessageModel<WeChatApiDto>.Success("", data);
return ServiceResult<WeChatApiDto>.OprateSuccess("", data);
}
else
{
return MessageModel<WeChatApiDto>.Success($"\r\n获取订阅用户失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}", data);
return ServiceResult<WeChatApiDto>.OprateSuccess($"\r\n获取订阅用户失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}", data);
}
}
public async Task<string> Valid(WeChatValidDto validDto,string body)
@ -203,10 +203,10 @@ namespace Tiobon.Core.Services
}
return objReturn;
}
public async Task<MessageModel<WeChatResponseUserInfo>> GetQRBind(WeChatUserInfo info)
public async Task<ServiceResult<WeChatResponseUserInfo>> GetQRBind(WeChatUserInfo info)
{
var res = await GetToken(info?.id);
if (!res.success) return MessageModel<WeChatResponseUserInfo>.Fail(res.msg);
if (!res.success) return ServiceResult<WeChatResponseUserInfo>.Fail(res.msg);
var push = new WeChatQRDto
{
expire_seconds = 604800,
@ -236,16 +236,16 @@ namespace Tiobon.Core.Services
data.id = info.userID;
await this.BaseDal.Db.Insertable<WeChatQR>(weChatQR).ExecuteCommandAsync();
reData.usersData= data;
return MessageModel<WeChatResponseUserInfo>.Success("获取二维码成功", reData);
return ServiceResult<WeChatResponseUserInfo>.OprateSuccess("获取二维码成功", reData);
}
public async Task<MessageModel<WeChatResponseUserInfo>> PushCardMsg(WeChatCardMsgDataDto msg,string ip)
public async Task<ServiceResult<WeChatResponseUserInfo>> PushCardMsg(WeChatCardMsgDataDto msg,string ip)
{
var bindUser = await BaseDal.Db.Queryable<WeChatSub>().Where(t => t.SubFromPublicAccount == msg.info.id && t.CompanyID == msg.info.companyCode && t.IsUnBind == false && msg.info.userID.Contains(t.SubJobID)).SingleAsync();
if (bindUser == null)
return MessageModel<WeChatResponseUserInfo>.Fail("用户不存在或者已经解绑!");
return ServiceResult<WeChatResponseUserInfo>.Fail("用户不存在或者已经解绑!");
var res = await GetToken(msg?.info?.id);
if(!res.success)
return MessageModel<WeChatResponseUserInfo>.Fail(res.msg);
return ServiceResult<WeChatResponseUserInfo>.Fail(res.msg);
WeChatResponseUserInfo reData = new WeChatResponseUserInfo();
reData.companyCode = msg.info.companyCode;
reData.id = msg.info.id;
@ -321,22 +321,22 @@ namespace Tiobon.Core.Services
}
if (reData.usersData.errcode.Equals(0))
{
return MessageModel<WeChatResponseUserInfo>.Success("卡片消息推送成功", reData);
return ServiceResult<WeChatResponseUserInfo>.OprateSuccess("卡片消息推送成功", reData);
}
else
{
return MessageModel<WeChatResponseUserInfo>.Success("卡片消息推送失败", reData);
return ServiceResult<WeChatResponseUserInfo>.OprateSuccess("卡片消息推送失败", reData);
}
}
catch (Exception ex)
{
return MessageModel<WeChatResponseUserInfo>.Success($"卡片消息推送错误=>{ex.Message}", reData);
return ServiceResult<WeChatResponseUserInfo>.OprateSuccess($"卡片消息推送错误=>{ex.Message}", reData);
}
}
public async Task<MessageModel<WeChatApiDto>> PushTxtMsg(WeChatPushTestDto msg) {
public async Task<ServiceResult<WeChatApiDto>> PushTxtMsg(WeChatPushTestDto msg) {
var res = await GetToken(msg.selectWeChat);
if (!res.success) return res;
var token = res.response.access_token;
@ -346,7 +346,7 @@ namespace Tiobon.Core.Services
}
else
{
MessageModel<WeChatApiDto> messageModel = new MessageModel<WeChatApiDto>();
ServiceResult<WeChatApiDto> messageModel = new ServiceResult<WeChatApiDto>();
messageModel.success = true;
//绑定用户
if (msg.selectOperate.Equals("one"))
@ -383,7 +383,7 @@ namespace Tiobon.Core.Services
}
}
public async Task<MessageModel<WeChatApiDto>> PushText(string token,WeChatPushTestDto msg) {
public async Task<ServiceResult<WeChatApiDto>> PushText(string token,WeChatPushTestDto msg) {
object data = null; ;
WeChatApiDto pushres = null; ;
@ -502,15 +502,15 @@ namespace Tiobon.Core.Services
}
if (pushres.errcode.Equals(0))
{
return MessageModel<WeChatApiDto>.Success("推送成功", pushres);
return ServiceResult<WeChatApiDto>.OprateSuccess("推送成功", pushres);
}
else
{
return MessageModel<WeChatApiDto>.Fail($"\r\n推送失败\r\n错误代码:{pushres.errcode}\r\n错误信息:{pushres.errmsg}", pushres);
return ServiceResult<WeChatApiDto>.Fail($"\r\n推送失败\r\n错误代码:{pushres.errcode}\r\n错误信息:{pushres.errmsg}", pushres);
}
}
public async Task<MessageModel<WeChatApiDto>> UpdateMenu(WeChatApiDto menu)
public async Task<ServiceResult<WeChatApiDto>> UpdateMenu(WeChatApiDto menu)
{
WeChatHelper.ConverMenuButtonForEvent(menu);
var res = await GetToken(menu.id);
@ -519,19 +519,19 @@ namespace Tiobon.Core.Services
if (data.errcode.Equals(0))
{
return MessageModel<WeChatApiDto>.Success("更新成功", data);
return ServiceResult<WeChatApiDto>.OprateSuccess("更新成功", data);
}
else
{
return MessageModel<WeChatApiDto>.Success("更新失败", data);
return ServiceResult<WeChatApiDto>.OprateSuccess("更新失败", data);
}
}
public async Task<MessageModel<WeChatResponseUserInfo>> GetBindUserInfo(WeChatUserInfo info)
public async Task<ServiceResult<WeChatResponseUserInfo>> GetBindUserInfo(WeChatUserInfo info)
{
var bindUser = await BaseDal.Db.Queryable<WeChatSub>().Where(t => t.SubFromPublicAccount == info.id && t.CompanyID == info.companyCode && info.userID.Equals(t.SubJobID) && t.IsUnBind == false ).FirstAsync();
if (bindUser == null) return MessageModel<WeChatResponseUserInfo>.Fail("用户不存在或者已经解绑!");
if (bindUser == null) return ServiceResult<WeChatResponseUserInfo>.Fail("用户不存在或者已经解绑!");
var res = await GetToken(info.id);
if(!res.success) return MessageModel<WeChatResponseUserInfo>.Fail(res.msg);
if(!res.success) return ServiceResult<WeChatResponseUserInfo>.Fail(res.msg);
var token = res.response.access_token;
WeChatResponseUserInfo reData = new WeChatResponseUserInfo();
reData.companyCode = info.companyCode;
@ -540,24 +540,24 @@ namespace Tiobon.Core.Services
reData.usersData = data;
if (data.errcode.Equals(0))
{
return MessageModel<WeChatResponseUserInfo>.Success("用户信息获取成功", reData);
return ServiceResult<WeChatResponseUserInfo>.OprateSuccess("用户信息获取成功", reData);
}
else
{
return MessageModel<WeChatResponseUserInfo>.Fail("用户信息获取失败", reData);
return ServiceResult<WeChatResponseUserInfo>.Fail("用户信息获取失败", reData);
}
}
public async Task<MessageModel<WeChatResponseUserInfo>> UnBind(WeChatUserInfo info)
public async Task<ServiceResult<WeChatResponseUserInfo>> UnBind(WeChatUserInfo info)
{
var bindUser = await BaseDal.Db.Queryable<WeChatSub>().Where(t => t.SubFromPublicAccount == info.id && t.CompanyID == info.companyCode && info.userID.Equals(t.SubJobID) && t.IsUnBind == false ).FirstAsync();
if (bindUser == null) return MessageModel<WeChatResponseUserInfo>.Fail("用户不存在或者已经解绑!");
if (bindUser == null) return ServiceResult<WeChatResponseUserInfo>.Fail("用户不存在或者已经解绑!");
WeChatResponseUserInfo reData = new WeChatResponseUserInfo();
reData.companyCode = info.companyCode;
reData.id = info.id;
bindUser.IsUnBind = true;
bindUser.SubUserRefTime = DateTime.Now;
await BaseDal.Db.Updateable<WeChatSub>(bindUser).UpdateColumns(t=> new{ t.IsUnBind,t.SubUserRefTime}).ExecuteCommandAsync();
return MessageModel<WeChatResponseUserInfo>.Success("用户解绑成功", reData);
return ServiceResult<WeChatResponseUserInfo>.OprateSuccess("用户解绑成功", reData);
}
public async Task<string> HandleWeChat(WeChatXMLDto weChat)

@ -16,24 +16,24 @@ namespace Tiobon.Core.Tasks
/// 开启任务调度
/// </summary>
/// <returns></returns>
Task<MessageModel<string>> StartScheduleAsync();
Task<ServiceResult<string>> StartScheduleAsync();
/// <summary>
/// 停止任务调度
/// </summary>
/// <returns></returns>
Task<MessageModel<string>> StopScheduleAsync();
Task<ServiceResult<string>> StopScheduleAsync();
/// <summary>
///
/// </summary>
/// <param name="sysSchedule"></param>
/// <returns></returns>
Task<MessageModel<string>> AddScheduleJobAsync(TasksQz sysSchedule);
Task<ServiceResult<string>> AddScheduleJobAsync(TasksQz sysSchedule);
/// <summary>
/// 停止一个任务
/// </summary>
/// <param name="sysSchedule"></param>
/// <returns></returns>
Task<MessageModel<string>> StopScheduleJobAsync(TasksQz sysSchedule);
Task<ServiceResult<string>> StopScheduleJobAsync(TasksQz sysSchedule);
/// <summary>
/// 检测任务是否存在
/// </summary>
@ -45,13 +45,13 @@ namespace Tiobon.Core.Tasks
/// </summary>
/// <param name="sysSchedule"></param>
/// <returns></returns>
Task<MessageModel<string>> PauseJob(TasksQz sysSchedule);
Task<ServiceResult<string>> PauseJob(TasksQz sysSchedule);
/// <summary>
/// 恢复一个任务
/// </summary>
/// <param name="sysSchedule"></param>
/// <returns></returns>
Task<MessageModel<string>> ResumeJob(TasksQz sysSchedule);
Task<ServiceResult<string>> ResumeJob(TasksQz sysSchedule);
/// <summary>
/// 获取任务触发器状态
@ -71,7 +71,7 @@ namespace Tiobon.Core.Tasks
/// </summary>
/// <param name="tasksQz"></param>
/// <returns></returns>
Task<MessageModel<string>> ExecuteJobAsync(TasksQz tasksQz);
Task<ServiceResult<string>> ExecuteJobAsync(TasksQz tasksQz);
}

@ -45,9 +45,9 @@ namespace Tiobon.Core.Tasks
/// 开启任务调度
/// </summary>
/// <returns></returns>
public async Task<MessageModel<string>> StartScheduleAsync()
public async Task<ServiceResult<string>> StartScheduleAsync()
{
var result = new MessageModel<string>();
var result = new ServiceResult<string>();
try
{
this._scheduler.Result.JobFactory = this._iocjobFactory;
@ -77,9 +77,9 @@ namespace Tiobon.Core.Tasks
/// 停止任务调度
/// </summary>
/// <returns></returns>
public async Task<MessageModel<string>> StopScheduleAsync()
public async Task<ServiceResult<string>> StopScheduleAsync()
{
var result = new MessageModel<string>();
var result = new ServiceResult<string>();
try
{
if (!this._scheduler.Result.IsShutdown)
@ -110,9 +110,9 @@ namespace Tiobon.Core.Tasks
/// <typeparam name="T"></typeparam>
/// <param name="tasksQz"></param>
/// <returns></returns>
public async Task<MessageModel<string>> AddScheduleJobAsync(TasksQz tasksQz)
public async Task<ServiceResult<string>> AddScheduleJobAsync(TasksQz tasksQz)
{
var result = new MessageModel<string>();
var result = new ServiceResult<string>();
if (tasksQz != null)
{
@ -224,9 +224,9 @@ namespace Tiobon.Core.Tasks
/// 暂停一个指定的计划任务
/// </summary>
/// <returns></returns>
public async Task<MessageModel<string>> StopScheduleJobAsync(TasksQz sysSchedule)
public async Task<ServiceResult<string>> StopScheduleJobAsync(TasksQz sysSchedule)
{
var result = new MessageModel<string>();
var result = new ServiceResult<string>();
try
{
JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup);
@ -255,9 +255,9 @@ namespace Tiobon.Core.Tasks
/// </summary>
/// <param name="sysSchedule"></param>
/// <returns></returns>
public async Task<MessageModel<string>> ResumeJob(TasksQz sysSchedule)
public async Task<ServiceResult<string>> ResumeJob(TasksQz sysSchedule)
{
var result = new MessageModel<string>();
var result = new ServiceResult<string>();
try
{
JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup);
@ -282,9 +282,9 @@ namespace Tiobon.Core.Tasks
/// </summary>
/// <param name="sysSchedule"></param>
/// <returns></returns>
public async Task<MessageModel<string>> PauseJob(TasksQz sysSchedule)
public async Task<ServiceResult<string>> PauseJob(TasksQz sysSchedule)
{
var result = new MessageModel<string>();
var result = new ServiceResult<string>();
try
{
JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup);
@ -455,9 +455,9 @@ namespace Tiobon.Core.Tasks
/// </summary>
/// <param name="tasksQz"></param>
/// <returns></returns>
public async Task<MessageModel<string>> ExecuteJobAsync(TasksQz tasksQz)
public async Task<ServiceResult<string>> ExecuteJobAsync(TasksQz tasksQz)
{
var result = new MessageModel<string>();
var result = new ServiceResult<string>();
try
{
JobKey jobKey = new JobKey(tasksQz.Id.ToString(), tasksQz.JobGroup);

@ -44,7 +44,7 @@ namespace Tiobon.Core.Tests
[Fact]
public async void Get_Tiobon_Page_Test()
{
MessageModel<PageModel<TiobonArticle>> Tiobons = await TiobonController.Get(1, 1, "技术博文", "");
ServiceResult<PageModel<TiobonArticle>> Tiobons = await TiobonController.Get(1, 1, "技术博文", "");
Assert.NotNull(Tiobons);
Assert.NotNull(Tiobons.response);
Assert.True(Tiobons.response.dataCount >= 0);
@ -53,7 +53,7 @@ namespace Tiobon.Core.Tests
[Fact]
public async void Get_Tiobon_Test()
{
MessageModel<TiobonViewModels> TiobonVo = await TiobonController.Get(1.ObjToLong());
ServiceResult<TiobonViewModels> TiobonVo = await TiobonController.Get(1.ObjToLong());
Assert.NotNull(TiobonVo);
}
@ -61,7 +61,7 @@ namespace Tiobon.Core.Tests
[Fact]
public async void Get_Tiobon_For_Nuxt_Test()
{
MessageModel<TiobonViewModels> TiobonVo = await TiobonController.DetailNuxtNoPer(1);
ServiceResult<TiobonViewModels> TiobonVo = await TiobonController.DetailNuxtNoPer(1);
Assert.NotNull(TiobonVo);
}
@ -77,7 +77,7 @@ namespace Tiobon.Core.Tests
[Fact]
public async void Get_Tiobon_By_Type_For_MVP_Test()
{
MessageModel<List<TiobonArticle>> Tiobons = await TiobonController.GetTiobonsByTypesForMVP("技术博文");
ServiceResult<List<TiobonArticle>> Tiobons = await TiobonController.GetTiobonsByTypesForMVP("技术博文");
Assert.NotNull(Tiobons);
Assert.True(Tiobons.success);
@ -88,7 +88,7 @@ namespace Tiobon.Core.Tests
[Fact]
public async void Get_Tiobon_By_Id_For_MVP_Test()
{
MessageModel<TiobonArticle> Tiobon = await TiobonController.GetTiobonByIdForMVP(1);
ServiceResult<TiobonArticle> Tiobon = await TiobonController.GetTiobonByIdForMVP(1);
Assert.NotNull(Tiobon);
Assert.True(Tiobon.success);

Loading…
Cancel
Save