From 88402008743f06376bacfff9f4bf3c87bc79edad Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Tue, 16 Apr 2024 15:08:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/BaseApiController.cs | 12 +- Tiobon.Core.Api/Controllers/BaseController.cs | 35 ++-- .../Controllers/DbFirst/DbFirstController.cs | 64 +++---- .../Controllers/DbFirst/MigrateController.cs | 30 +-- .../Controllers/DepartmentController.cs | 48 ++--- .../Controllers/LoginController.cs | 16 +- .../Controllers/NacosController.cs | 30 +-- .../Controllers/PermissionController.cs | 54 +++--- .../Controllers/SplitDemoController.cs | 40 ++-- .../Controllers/TasksQzController.cs | 174 +++++++++--------- .../Controllers/TopicController.cs | 8 +- .../Controllers/TopicDetailController.cs | 38 ++-- .../Controllers/TransactionController.cs | 6 +- Tiobon.Core.Api/Controllers/UserController.cs | 30 +-- .../Controllers/UserRoleController.cs | 18 +- .../Controllers/ValuesController.cs | 10 +- .../Controllers/WeChatCompanyController.cs | 22 +-- .../Controllers/WeChatConfigController.cs | 22 +-- .../Controllers/WeChatPushLogController.cs | 22 +-- .../Controllers/WeChatSubController.cs | 22 +-- .../Filter/GlobalExceptionFilter.cs | 14 +- Tiobon.Core.Api/Tiobon.Core.Model.xml | 36 ++-- .../Policys/ApiResponseHandler.cs | 2 +- .../Policys/PermissionHandler.cs | 8 +- .../HostedService/QuartzJobHostedService.cs | 4 +- .../Controllers/UserController.cs | 4 +- Tiobon.Core.Model/ApiResponse.cs | 6 +- Tiobon.Core.Model/ServiceResult.cs | 66 +++---- Tiobon.Core.Services/GuestbookServices.cs | 8 +- Tiobon.Core.Services/PayServices.cs | 108 +++++------ Tiobon.Core.Services/WeChatConfigServices.cs | 120 ++++++------ .../QuartzNet/SchedulerCenterServer.cs | 70 +++---- .../Controller_Test/BlogController_Should.cs | 32 ++-- 33 files changed, 591 insertions(+), 588 deletions(-) diff --git a/Tiobon.Core.Api/Controllers/BaseApiController.cs b/Tiobon.Core.Api/Controllers/BaseApiController.cs index 69254a13..63b89a64 100644 --- a/Tiobon.Core.Api/Controllers/BaseApiController.cs +++ b/Tiobon.Core.Api/Controllers/BaseApiController.cs @@ -7,7 +7,7 @@ namespace Tiobon.Core.Controllers [NonAction] public ServiceResult Success(T data, string msg = "成功") { - return new ServiceResult() { success = true, msg = msg, response = data, }; + return new ServiceResult() { Success = true, Message = msg, Data = data, }; } // [NonAction] @@ -23,31 +23,31 @@ namespace Tiobon.Core.Controllers [NonAction] public ServiceResult Success(string msg = "成功") { - return new ServiceResult() { success = true, msg = msg, response = null, }; + return new ServiceResult() { Success = true, Message = msg, Data = null, }; } [NonAction] public ServiceResult Failed(string msg = "失败", int status = 500) { - return new ServiceResult() { success = false, status = status, msg = msg, response = null, }; + return new ServiceResult() { Success = false, Status = status, Message = msg, Data = null, }; } [NonAction] public ServiceResult Failed(string msg = "失败", int status = 500) { - return new ServiceResult() { success = false, status = status, msg = msg, response = default, }; + return new ServiceResult() { Success = false, Status = status, Message = msg, Data = default, }; } [NonAction] public ServiceResult> SuccessPage(int page, int dataCount, int pageSize, List data, int pageCount, string msg = "获取成功") { - return new ServiceResult>() { success = true, msg = msg, response = new PageModel(page, dataCount, pageSize, data) }; + return new ServiceResult>() { Success = true, Message = msg, Data = new PageModel(page, dataCount, pageSize, data) }; } [NonAction] public ServiceResult> SuccessPage(PageModel pageModel, string msg = "获取成功") { - return new ServiceResult>() { success = true, msg = msg, response = pageModel }; + return new ServiceResult>() { Success = true, Message = msg, Data = pageModel }; } } } \ No newline at end of file diff --git a/Tiobon.Core.Api/Controllers/BaseController.cs b/Tiobon.Core.Api/Controllers/BaseController.cs index 123efede..04085b48 100644 --- a/Tiobon.Core.Api/Controllers/BaseController.cs +++ b/Tiobon.Core.Api/Controllers/BaseController.cs @@ -1,4 +1,5 @@ using System.Reflection; +using Confluent.Kafka; namespace Tiobon.Core.Controllers; @@ -66,9 +67,9 @@ public class BaseController(null, "新增成功"); var id = Convert.ToInt64(await InvokeServiceAsync("Add", [insertModel])); - data.success = id > 0; - if (data.success) - data.response = id.ObjToString(); + data.Success = id > 0; + if (data.Success) + data.Data = id.ObjToString(); else return Failed("新增失败"); @@ -107,8 +108,8 @@ public class BaseController Success(T data, string msg = "成功") + public ServiceResult Success(T data, string message = "成功") { - return new ServiceResult() { success = true, msg = msg, response = data, }; + return new ServiceResult() { Success = true, Message = message, Data = data, }; } // [NonAction] @@ -164,32 +165,32 @@ public class BaseController Failed(string msg = "失败", int status = 500) + public ServiceResult Failed(string message = "失败", int status = 500) { - return new ServiceResult() { success = false, status = status, msg = msg, response = default, }; + return new ServiceResult() { Success = false, Status = status, Message = message, Data = default, }; } [NonAction] - public ServiceResult> SuccessPage(int page, int dataCount, int pageSize, List data, int pageCount, string msg = "获取成功") + public ServiceResult> SuccessPage(int page, int dataCount, int pageSize, List data, int pageCount, string message = "获取成功") { - return new ServiceResult>() { success = true, msg = msg, response = new PageModel(page, dataCount, pageSize, data) }; + return new ServiceResult>() { Success = true, Message = message, Data = new PageModel(page, dataCount, pageSize, data) }; } [NonAction] - public ServiceResult> SuccessPage(PageModel pageModel, string msg = "获取成功") + public ServiceResult> SuccessPage(PageModel pageModel, string message = "获取成功") { - return new ServiceResult>() { success = true, msg = msg, response = pageModel }; + return new ServiceResult>() { Success = true, Message = message, Data = pageModel }; } } \ No newline at end of file diff --git a/Tiobon.Core.Api/Controllers/DbFirst/DbFirstController.cs b/Tiobon.Core.Api/Controllers/DbFirst/DbFirstController.cs index 69a48049..e6578c50 100644 --- a/Tiobon.Core.Api/Controllers/DbFirst/DbFirstController.cs +++ b/Tiobon.Core.Api/Controllers/DbFirst/DbFirstController.cs @@ -28,21 +28,21 @@ namespace Tiobon.Core.Controllers [HttpGet] public ServiceResult GetFrameFiles() { - var data = new ServiceResult() { success = true, msg = "" }; - data.response += @"file path is:C:\my-file\}"; + var data = new ServiceResult() { Success = true, Message = "" }; + data.Data += @"file path is:C:\my-file\}"; var isMuti = BaseDBConfig.IsMulti; if (Env.IsDevelopment()) { - data.response += $"Controller层生成：{FrameSeed.CreateControllers(_sqlSugarClient)} || "; + data.Data += $"Controller层生成：{FrameSeed.CreateControllers(_sqlSugarClient)} || "; BaseDBConfig.ValidConfig.ForEach(m => { _sqlSugarClient.ChangeDatabase(m.ConfigId.ToLower()); - data.response += $"库{m.ConfigId}-Model层生成：{FrameSeed.CreateModels(_sqlSugarClient, m.ConfigId, isMuti)} || "; - data.response += $"库{m.ConfigId}-IRepositorys层生成：{FrameSeed.CreateIRepositorys(_sqlSugarClient, m.ConfigId, isMuti)} || "; - data.response += $"库{m.ConfigId}-IServices层生成：{FrameSeed.CreateIServices(_sqlSugarClient, m.ConfigId, isMuti)} || "; - data.response += $"库{m.ConfigId}-Repository层生成：{FrameSeed.CreateRepository(_sqlSugarClient, m.ConfigId, isMuti)} || "; - data.response += $"库{m.ConfigId}-Services层生成：{FrameSeed.CreateServices(_sqlSugarClient, m.ConfigId, isMuti)} || "; + data.Data += $"库{m.ConfigId}-Model层生成：{FrameSeed.CreateModels(_sqlSugarClient, m.ConfigId, isMuti)} || "; + data.Data += $"库{m.ConfigId}-IRepositorys层生成：{FrameSeed.CreateIRepositorys(_sqlSugarClient, m.ConfigId, isMuti)} || "; + data.Data += $"库{m.ConfigId}-IServices层生成：{FrameSeed.CreateIServices(_sqlSugarClient, m.ConfigId, isMuti)} || "; + data.Data += $"库{m.ConfigId}-Repository层生成：{FrameSeed.CreateRepository(_sqlSugarClient, m.ConfigId, isMuti)} || "; + data.Data += $"库{m.ConfigId}-Services层生成：{FrameSeed.CreateServices(_sqlSugarClient, m.ConfigId, isMuti)} || "; }); // 切回主库 @@ -50,8 +50,8 @@ namespace Tiobon.Core.Controllers } else { - data.success = false; - data.msg = "当前不处于开发模式，代码生成不可用！"; + data.Success = false; + data.Message = "当前不处于开发模式，代码生成不可用！"; } return data; @@ -69,18 +69,18 @@ namespace Tiobon.Core.Controllers ConnID = ConnID == null ? MainDb.CurrentDbConnId.ToLower() : ConnID; var isMuti = BaseDBConfig.IsMulti; - var data = new ServiceResult() { success = true, msg = "" }; + var data = new ServiceResult() { Success = true, Message = "" }; if (Env.IsDevelopment()) { - data.response += $"库{ConnID}-IRepositorys层生成：{FrameSeed.CreateIRepositorys(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; - data.response += $"库{ConnID}-IServices层生成：{FrameSeed.CreateIServices(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; - data.response += $"库{ConnID}-Repository层生成：{FrameSeed.CreateRepository(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; - data.response += $"库{ConnID}-Services层生成：{FrameSeed.CreateServices(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; + data.Data += $"库{ConnID}-IRepositorys层生成：{FrameSeed.CreateIRepositorys(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; + data.Data += $"库{ConnID}-IServices层生成：{FrameSeed.CreateIServices(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; + data.Data += $"库{ConnID}-Repository层生成：{FrameSeed.CreateRepository(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; + data.Data += $"库{ConnID}-Services层生成：{FrameSeed.CreateServices(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; } else { - data.success = false; - data.msg = "当前不处于开发模式，代码生成不可用！"; + data.Success = false; + data.Message = "当前不处于开发模式，代码生成不可用！"; } return data; @@ -97,15 +97,15 @@ namespace Tiobon.Core.Controllers ConnID = ConnID == null ? MainDb.CurrentDbConnId.ToLower() : ConnID; var isMuti = BaseDBConfig.IsMulti; - var data = new ServiceResult() { success = true, msg = "" }; + var data = new ServiceResult() { Success = true, Message = "" }; if (Env.IsDevelopment()) { - data.response += $"库{ConnID}-Models层生成：{FrameSeed.CreateModels(_sqlSugarClient, ConnID, isMuti, tableNames)}"; + data.Data += $"库{ConnID}-Models层生成：{FrameSeed.CreateModels(_sqlSugarClient, ConnID, isMuti, tableNames)}"; } else { - data.success = false; - data.msg = "当前不处于开发模式，代码生成不可用！"; + data.Success = false; + data.Message = "当前不处于开发模式，代码生成不可用！"; } return data; } @@ -121,15 +121,15 @@ namespace Tiobon.Core.Controllers ConnID = ConnID == null ? MainDb.CurrentDbConnId.ToLower() : ConnID; var isMuti = BaseDBConfig.IsMulti; - var data = new ServiceResult() { success = true, msg = "" }; + var data = new ServiceResult() { Success = true, Message = "" }; if (Env.IsDevelopment()) { - data.response += $"库{ConnID}-Controllers层生成：{FrameSeed.CreateControllers(_sqlSugarClient, ConnID, isMuti, tableNames)}"; + data.Data += $"库{ConnID}-Controllers层生成：{FrameSeed.CreateControllers(_sqlSugarClient, ConnID, isMuti, tableNames)}"; } else { - data.success = false; - data.msg = "当前不处于开发模式，代码生成不可用！"; + data.Success = false; + data.Message = "当前不处于开发模式，代码生成不可用！"; } return data; } @@ -148,23 +148,23 @@ namespace Tiobon.Core.Controllers ConnID = ConnID == null ? MainDb.CurrentDbConnId.ToLower() : ConnID; var isMuti = BaseDBConfig.IsMulti; - var data = new ServiceResult() { success = true, msg = "" }; + var data = new ServiceResult() { Success = true, Message = "" }; if (Env.IsDevelopment()) { _sqlSugarClient.ChangeDatabase(ConnID.ToLower()); - data.response += $"Controller层生成：{FrameSeed.CreateControllers(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; - data.response += $"库{ConnID}-Model层生成：{FrameSeed.CreateModels(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; + data.Data += $"Controller层生成：{FrameSeed.CreateControllers(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; + data.Data += $"库{ConnID}-Model层生成：{FrameSeed.CreateModels(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; //data.response += $"库{ConnID}-IRepositorys层生成：{FrameSeed.CreateIRepositorys(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; - data.response += $"库{ConnID}-IServices层生成：{FrameSeed.CreateIServices(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; + data.Data += $"库{ConnID}-IServices层生成：{FrameSeed.CreateIServices(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; //data.response += $"库{ConnID}-Repository层生成：{FrameSeed.CreateRepository(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; - data.response += $"库{ConnID}-Services层生成：{FrameSeed.CreateServices(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; + data.Data += $"库{ConnID}-Services层生成：{FrameSeed.CreateServices(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; // 切回主库 _sqlSugarClient.ChangeDatabase(MainDb.CurrentDbConnId.ToLower()); } else { - data.success = false; - data.msg = "当前不处于开发模式，代码生成不可用！"; + data.Success = false; + data.Message = "当前不处于开发模式，代码生成不可用！"; } return data; diff --git a/Tiobon.Core.Api/Controllers/DbFirst/MigrateController.cs b/Tiobon.Core.Api/Controllers/DbFirst/MigrateController.cs index 2c2cf4a7..90647eff 100644 --- a/Tiobon.Core.Api/Controllers/DbFirst/MigrateController.cs +++ b/Tiobon.Core.Api/Controllers/DbFirst/MigrateController.cs @@ -48,7 +48,7 @@ namespace Tiobon.Core.Controllers [HttpGet] public async Task> DataMigrateFromOld2New() { - var data = new ServiceResult() { success = true, msg = "" }; + var data = new ServiceResult() { Success = true, Message = "" }; var filterPermissionId = 122; if (_env.IsDevelopment()) { @@ -123,8 +123,8 @@ namespace Tiobon.Core.Controllers _unitOfWorkManage.CommitTran(); - data.success = true; - data.msg = "导入成功！"; + data.Success = true; + data.Message = "导入成功！"; } catch (Exception) { @@ -134,8 +134,8 @@ namespace Tiobon.Core.Controllers } else { - data.success = false; - data.msg = "当前不处于开发模式，代码生成不可用！"; + data.Success = false; + data.Message = "当前不处于开发模式，代码生成不可用！"; } return data; @@ -149,7 +149,7 @@ namespace Tiobon.Core.Controllers [HttpGet] public async Task> SaveData2TsvAsync() { - var data = new ServiceResult() { success = true, msg = "" }; + var data = new ServiceResult() { Success = true, Message = "" }; if (_env.IsDevelopment()) { @@ -185,13 +185,13 @@ namespace Tiobon.Core.Controllers - data.success = true; - data.msg = "生成成功！"; + data.Success = true; + data.Message = "生成成功！"; } else { - data.success = false; - data.msg = "当前不处于开发模式，代码生成不可用！"; + data.Success = false; + data.Message = "当前不处于开发模式，代码生成不可用！"; } return data; @@ -205,7 +205,7 @@ namespace Tiobon.Core.Controllers [HttpGet] public async Task> SaveData2ExcelAsync() { - var data = new ServiceResult() { success = true, msg = "" }; + var data = new ServiceResult() { Success = true, Message = "" }; if (_env.IsDevelopment()) { @@ -245,13 +245,13 @@ namespace Tiobon.Core.Controllers FileHelper.WriteFile(Path.Combine(_env.WebRootPath, "TiobonCore.Data.excel", "RoleModulePermission.xlsx"), RoleModulePermissionResult); - data.success = true; - data.msg = "生成成功！"; + data.Success = true; + data.Message = "生成成功！"; } else { - data.success = false; - data.msg = "当前不处于开发模式，代码生成不可用！"; + data.Success = false; + data.Message = "当前不处于开发模式，代码生成不可用！"; } return data; diff --git a/Tiobon.Core.Api/Controllers/DepartmentController.cs b/Tiobon.Core.Api/Controllers/DepartmentController.cs index c4cf10b8..3eeb9f88 100644 --- a/Tiobon.Core.Api/Controllers/DepartmentController.cs +++ b/Tiobon.Core.Api/Controllers/DepartmentController.cs @@ -26,9 +26,9 @@ return new ServiceResult>() { - msg = "获取成功", - success = true, - response = await _departmentServices.QueryPage(whereExpression, page, intPageSize) + Message = "获取成功", + Success = true, + Data = await _departmentServices.QueryPage(whereExpression, page, intPageSize) }; } @@ -38,9 +38,9 @@ { return new ServiceResult() { - msg = "获取成功", - success = true, - response = await _departmentServices.QueryById(id) + Message = "获取成功", + Success = true, + Data = await _departmentServices.QueryById(id) }; } @@ -132,11 +132,11 @@ var data = new ServiceResult(); var id = await _departmentServices.Add(request); - data.success = id > 0; - if (data.success) + data.Success = id > 0; + if (data.Success) { - data.response = id.ObjToString(); - data.msg = "添加成功"; + data.Data = id.ObjToString(); + data.Message = "添加成功"; } return data; @@ -146,11 +146,11 @@ public async Task> Put([FromBody] Department request) { var data = new ServiceResult(); - data.success = await _departmentServices.Update(request); - if (data.success) + data.Success = await _departmentServices.Update(request); + if (data.Success) { - data.msg = "更新成功"; - data.response = request?.Id.ObjToString(); + data.Message = "更新成功"; + data.Data = request?.Id.ObjToString(); } return data; @@ -162,13 +162,13 @@ var data = new ServiceResult(); var model = await _departmentServices.QueryById(id); model.IsDeleted = true; - data.success = await _departmentServices.Update(model); - if (data.success) + data.Success = await _departmentServices.Update(model); + if (data.Success) { - data.msg = "删除成功"; - data.response = model?.Id.ObjToString(); + data.Message = "删除成功"; + data.Data = model?.Id.ObjToString(); } - + return data; } @@ -177,7 +177,7 @@ [AllowAnonymous] public async Task> SaveData2Tsv() { - var data = new ServiceResult() { success = true, msg = "" }; + var data = new ServiceResult() { Success = true, Message = "" }; if (_env.IsDevelopment()) { @@ -189,13 +189,13 @@ var rolesJson = JsonConvert.SerializeObject(await _departmentServices.Query(d => d.IsDeleted == false), microsoftDateFormatSettings); FileHelper.WriteFile(Path.Combine(_env.WebRootPath, "TiobonCore.Data.json", "Department_New.tsv"), rolesJson, Encoding.UTF8); - data.success = true; - data.msg = "生成成功！"; + data.Success = true; + data.Message = "生成成功！"; } else { - data.success = false; - data.msg = "当前不处于开发模式，代码生成不可用！"; + data.Success = false; + data.Message = "当前不处于开发模式，代码生成不可用！"; } return data; diff --git a/Tiobon.Core.Api/Controllers/LoginController.cs b/Tiobon.Core.Api/Controllers/LoginController.cs index ea6e50ec..7584cc96 100644 --- a/Tiobon.Core.Api/Controllers/LoginController.cs +++ b/Tiobon.Core.Api/Controllers/LoginController.cs @@ -76,9 +76,9 @@ namespace Tiobon.Core.Controllers return new ServiceResult() { - success = suc, - msg = suc ? "获取成功" : "获取失败", - response = jwtStr + Success = suc, + Message = suc ? "获取成功" : "获取失败", + Data = jwtStr }; } @@ -120,9 +120,9 @@ namespace Tiobon.Core.Controllers return new ServiceResult() { - success = suc, - msg = suc ? "获取成功" : "获取失败", - response = jwtStr + Success = suc, + Message = suc ? "获取成功" : "获取失败", + Data = jwtStr }; } @@ -305,10 +305,10 @@ namespace Tiobon.Core.Controllers try { var result = await GetJwtToken3(loginRequest.name, loginRequest.pwd); - if (result.success) + if (result.Success) { HttpContext.SuccessSwagger(); - HttpContext.SuccessSwaggerJwt(result.response.token); + HttpContext.SuccessSwaggerJwt(result.Data.token); return new {result = true}; } } diff --git a/Tiobon.Core.Api/Controllers/NacosController.cs b/Tiobon.Core.Api/Controllers/NacosController.cs index 80e061cb..cfe7ba67 100644 --- a/Tiobon.Core.Api/Controllers/NacosController.cs +++ b/Tiobon.Core.Api/Controllers/NacosController.cs @@ -45,8 +45,8 @@ namespace Tiobon.Core.Api.Controllers // 然后再进行服务上线 var data = new ServiceResult(); // *************** 此处请求一下db 跟redis连接等 项目中简介 保证项目已全部启动 - data.success = true; - data.msg = "SUCCESS"; + data.Success = true; + data.Message = "SUCCESS"; return data; } @@ -63,9 +63,9 @@ namespace Tiobon.Core.Api.Controllers var instances = await NacosNamingService.GetAllInstances(JsonConfigSettings.NacosServiceName); if (instances == null || instances.Count == 0) { - data.status = 406; - data.msg = "DOWN"; - data.success = false; + data.Status = 406; + data.Message = "DOWN"; + data.Success = false; return data; } // 获取当前程序IP @@ -79,16 +79,16 @@ namespace Tiobon.Core.Api.Controllers // var baseUrl = await NacosNamingService.GetServerStatus(); if (isUp) { - data.status = 200; - data.msg = "UP"; - data.success = true; + data.Status = 200; + data.Message = "UP"; + data.Success = true; return data; } else { - data.status = 406; - data.msg = "DOWN"; - data.success = false; + data.Status = 406; + data.Message = "DOWN"; + data.Success = false; return data; } } @@ -113,8 +113,8 @@ namespace Tiobon.Core.Api.Controllers Metadata = JsonConfigSettings.NacosMetadata }; await NacosNamingService.RegisterInstance(JsonConfigSettings.NacosServiceName, Nacos.V2.Common.Constants.DEFAULT_GROUP, instance); - data.success = true; - data.msg = "SUCCESS"; + data.Success = true; + data.Message = "SUCCESS"; return data; } @@ -127,8 +127,8 @@ namespace Tiobon.Core.Api.Controllers { var data = new ServiceResult(); await NacosNamingService.DeregisterInstance(JsonConfigSettings.NacosServiceName, Nacos.V2.Common.Constants.DEFAULT_GROUP, IpHelper.GetCurrentIp(null), JsonConfigSettings.NacosPort); - data.success = true; - data.msg = "SUCCESS"; + data.Success = true; + data.Message = "SUCCESS"; return data; } } diff --git a/Tiobon.Core.Api/Controllers/PermissionController.cs b/Tiobon.Core.Api/Controllers/PermissionController.cs index f0ff1610..316296c0 100644 --- a/Tiobon.Core.Api/Controllers/PermissionController.cs +++ b/Tiobon.Core.Api/Controllers/PermissionController.cs @@ -352,7 +352,7 @@ namespace Tiobon.Core.Controllers { roleIds = (from item in _httpContext.HttpContext.User.Claims where item.Type == "role" - select item.Value.ObjToLong()).ToList(); + select item.Value.ObjToLong()).ToList(); } } else @@ -411,11 +411,11 @@ namespace Tiobon.Core.Controllers permissionTrees = permissionTrees.OrderBy(d => d.order).ToList(); RecursionHelper.LoopNaviBarAppendChildren(permissionTrees, rootRoot); - data.success = true; - if (data.success) + data.Success = true; + if (data.Success) { - data.response = rootRoot; - data.msg = "获取成功"; + data.Data = rootRoot; + data.Message = "获取成功"; } } } @@ -499,11 +499,11 @@ namespace Tiobon.Core.Controllers permissionTrees = permissionTrees.OrderBy(d => d.order).ToList(); - data.success = true; - if (data.success) + data.Success = true; + if (data.Success) { - data.response = permissionTrees; - data.msg = "获取成功"; + data.Data = permissionTrees; + data.Message = "获取成功"; } } } @@ -572,12 +572,12 @@ namespace Tiobon.Core.Controllers var data = new ServiceResult(); if (permission != null && permission.Id > 0) { - data.success = await _permissionServices.Update(permission); + data.Success = await _permissionServices.Update(permission); await _roleModulePermissionServices.UpdateModuleId(permission.Id, permission.Mid); - if (data.success) + if (data.Success) { - data.msg = "更新成功"; - data.response = permission?.Id.ObjToString(); + data.Message = "更新成功"; + data.Data = permission?.Id.ObjToString(); } } @@ -598,11 +598,11 @@ namespace Tiobon.Core.Controllers { var userDetail = await _permissionServices.QueryById(id); userDetail.IsDeleted = true; - data.success = await _permissionServices.Update(userDetail); - if (data.success) + data.Success = await _permissionServices.Update(userDetail); + if (data.Success) { - data.msg = "删除成功"; - data.response = userDetail?.Id.ObjToString(); + data.Message = "删除成功"; + data.Data = userDetail?.Id.ObjToString(); } } @@ -634,11 +634,11 @@ namespace Tiobon.Core.Controllers } } - data.success = ids.IsNotEmptyOrNull(); - if (data.success) + data.Success = ids.IsNotEmptyOrNull(); + if (data.Success) { - data.response = ids; - data.msg = $"{sucCount}条数据添加成功"; + data.Data = ids; + data.Message = $"{sucCount}条数据添加成功"; } return data; @@ -654,7 +654,7 @@ namespace Tiobon.Core.Controllers var data = new ServiceResult>(); if (controllerName.IsNullOrEmpty()) { - data.msg = "必须填写要迁移的所属接口的控制器名称"; + data.Message = "必须填写要迁移的所属接口的控制器名称"; return data; } @@ -669,7 +669,7 @@ namespace Tiobon.Core.Controllers var url = $"{Configuration}/swagger/V2/swagger.json"; if (Configuration.IsNullOrEmpty()) { - data.msg = "Swagger.json在线文件域名不能为空"; + data.Message = "Swagger.json在线文件域名不能为空"; return data; } if (token.IsNullOrEmpty()) token = Request.Headers.Authorization; @@ -763,12 +763,12 @@ namespace Tiobon.Core.Controllers } } - data.msg = "同步完成"; + data.Message = "同步完成"; } - data.response = permissions; - data.status = 200; - data.success = isAction; + data.Data = permissions; + data.Status = 200; + data.Success = isAction; return data; } diff --git a/Tiobon.Core.Api/Controllers/SplitDemoController.cs b/Tiobon.Core.Api/Controllers/SplitDemoController.cs index addb8d2f..4a854e62 100644 --- a/Tiobon.Core.Api/Controllers/SplitDemoController.cs +++ b/Tiobon.Core.Api/Controllers/SplitDemoController.cs @@ -35,7 +35,7 @@ } Expression> whereExpression = a => (a.Name != null && a.Name.Contains(key)); var data = await splitDemoServices.QueryPageSplit(whereExpression, beginTime, endTime, page, pageSize, " Id desc "); - return ServiceResult>.Message(data.dataCount >= 0, "获取成功", data); + return ServiceResult>.OprateSuccess(data.dataCount >= 0, "获取成功", data); } /// @@ -71,17 +71,17 @@ var data = new ServiceResult(); //unitOfWorkManage.BeginTran(); var id = (await splitDemoServices.AddSplit(splitDemo)); - data.success = (id == null ? false : true); + data.Success = (id == null ? false : true); try { - if (data.success) + if (data.Success) { - data.response = id.FirstOrDefault().ToString(); - data.msg = "添加成功"; + data.Data = id.FirstOrDefault().ToString(); + data.Message = "添加成功"; } else { - data.msg = "添加失败"; + data.Message = "添加失败"; } } catch (Exception) @@ -90,7 +90,7 @@ } finally { - //if (data.success) + //if (data.Success) // unitOfWorkManage.CommitTran(); //else // unitOfWorkManage.RollbackTran(); @@ -111,17 +111,17 @@ if (splitDemo != null && splitDemo.Id > 0) { unitOfWorkManage.BeginTran(); - data.success = await splitDemoServices.UpdateSplit(splitDemo, splitDemo.CreateTime); + data.Success = await splitDemoServices.UpdateSplit(splitDemo, splitDemo.CreateTime); try { - if (data.success) + if (data.Success) { - data.msg = "修改成功"; - data.response = splitDemo?.Id.ObjToString(); + data.Message = "修改成功"; + data.Data = splitDemo?.Id.ObjToString(); } else { - data.msg = "修改失败"; + data.Message = "修改失败"; } } catch (Exception) @@ -130,7 +130,7 @@ } finally { - if (data.success) + if (data.Success) unitOfWorkManage.CommitTran(); else unitOfWorkManage.RollbackTran(); @@ -154,17 +154,17 @@ if (model != null) { unitOfWorkManage.BeginTran(); - data.success = await splitDemoServices.DeleteSplit(model,model.CreateTime); + data.Success = await splitDemoServices.DeleteSplit(model,model.CreateTime); try { - data.response = id.ObjToString(); - if (data.success) + data.Data = id.ObjToString(); + if (data.Success) { - data.msg = "删除成功"; + data.Message = "删除成功"; } else { - data.msg = "删除失败"; + data.Message = "删除失败"; } } @@ -174,7 +174,7 @@ } finally { - if (data.success) + if (data.Success) unitOfWorkManage.CommitTran(); else unitOfWorkManage.RollbackTran(); @@ -182,7 +182,7 @@ } else { - data.msg = "不存在"; + data.Message = "不存在"; } return data; diff --git a/Tiobon.Core.Api/Controllers/TasksQzController.cs b/Tiobon.Core.Api/Controllers/TasksQzController.cs index 0a22dd2c..f35b6421 100644 --- a/Tiobon.Core.Api/Controllers/TasksQzController.cs +++ b/Tiobon.Core.Api/Controllers/TasksQzController.cs @@ -48,7 +48,7 @@ namespace Tiobon.Core.Controllers item.Triggers = await _schedulerCenter.GetTaskStaus(item); } } - return ServiceResult>.Message(data.dataCount >= 0, "获取成功", data); + return ServiceResult>.OprateSuccess(data.dataCount >= 0, "获取成功", data); } /// @@ -62,32 +62,32 @@ namespace Tiobon.Core.Controllers var data = new ServiceResult(); _unitOfWorkManage.BeginTran(); var id = (await _tasksQzServices.Add(tasksQz)); - data.success = id > 0; + data.Success = id > 0; try { - if (data.success) + if (data.Success) { tasksQz.Id = id; - data.response = id.ObjToString(); - data.msg = "添加成功"; + data.Data = id.ObjToString(); + data.Message = "添加成功"; if (tasksQz.IsStart) { //如果是启动自动 var ResuleModel = await _schedulerCenter.AddScheduleJobAsync(tasksQz); - data.success = ResuleModel.success; - if (ResuleModel.success) + data.Success = ResuleModel.Success; + if (ResuleModel.Success) { - data.msg = $"{data.msg}=>启动成功=>{ResuleModel.msg}"; + data.Message = $"{data.Message}=>启动成功=>{ResuleModel.Message}"; } else { - data.msg = $"{data.msg}=>启动失败=>{ResuleModel.msg}"; + data.Message = $"{data.Message}=>启动失败=>{ResuleModel.Message}"; } } } else { - data.msg = "添加失败"; + data.Message = "添加失败"; } } @@ -97,7 +97,7 @@ namespace Tiobon.Core.Controllers } finally { - if (data.success) + if (data.Success) _unitOfWorkManage.CommitTran(); else _unitOfWorkManage.RollbackTran(); @@ -118,30 +118,30 @@ namespace Tiobon.Core.Controllers if (tasksQz != null && tasksQz.Id > 0) { _unitOfWorkManage.BeginTran(); - data.success = await _tasksQzServices.Update(tasksQz); + data.Success = await _tasksQzServices.Update(tasksQz); try { - if (data.success) + if (data.Success) { - data.msg = "修改成功"; - data.response = tasksQz?.Id.ObjToString(); + data.Message = "修改成功"; + data.Data = tasksQz?.Id.ObjToString(); if (tasksQz.IsStart) { var ResuleModelStop = await _schedulerCenter.StopScheduleJobAsync(tasksQz); - data.msg = $"{data.msg}=>停止:{ResuleModelStop.msg}"; + data.Message = $"{data.Message}=>停止:{ResuleModelStop.Message}"; var ResuleModelStar = await _schedulerCenter.AddScheduleJobAsync(tasksQz); - data.success = ResuleModelStar.success; - data.msg = $"{data.msg}=>启动:{ResuleModelStar.msg}"; + data.Success = ResuleModelStar.Success; + data.Message = $"{data.Message}=>启动:{ResuleModelStar.Message}"; } else { var ResuleModelStop = await _schedulerCenter.StopScheduleJobAsync(tasksQz); - data.msg = $"{data.msg}=>停止:{ResuleModelStop.msg}"; + data.Message = $"{data.Message}=>停止:{ResuleModelStop.Message}"; } } else { - data.msg = "修改失败"; + data.Message = "修改失败"; } } catch (Exception) @@ -150,7 +150,7 @@ namespace Tiobon.Core.Controllers } finally { - if (data.success) + if (data.Success) _unitOfWorkManage.CommitTran(); else _unitOfWorkManage.RollbackTran(); @@ -172,19 +172,19 @@ namespace Tiobon.Core.Controllers if (model != null) { _unitOfWorkManage.BeginTran(); - data.success = await _tasksQzServices.Delete(model); + data.Success = await _tasksQzServices.Delete(model); try { - data.response = jobId.ObjToString(); - if (data.success) + data.Data = jobId.ObjToString(); + if (data.Success) { - data.msg = "删除成功"; + data.Message = "删除成功"; var ResuleModel = await _schedulerCenter.StopScheduleJobAsync(model); - data.msg = $"{data.msg}=>任务状态=>{ResuleModel.msg}"; + data.Message = $"{data.Message}=>任务状态=>{ResuleModel.Message}"; } else { - data.msg = "删除失败"; + data.Message = "删除失败"; } } @@ -194,7 +194,7 @@ namespace Tiobon.Core.Controllers } finally { - if (data.success) + if (data.Success) _unitOfWorkManage.CommitTran(); else _unitOfWorkManage.RollbackTran(); @@ -202,7 +202,7 @@ namespace Tiobon.Core.Controllers } else { - data.msg = "任务不存在"; + data.Message = "任务不存在"; } return data; @@ -224,26 +224,26 @@ namespace Tiobon.Core.Controllers try { model.IsStart = true; - data.success = await _tasksQzServices.Update(model); - data.response = jobId.ObjToString(); - if (data.success) + data.Success = await _tasksQzServices.Update(model); + data.Data = jobId.ObjToString(); + if (data.Success) { - data.msg = "更新成功"; + data.Message = "更新成功"; var ResuleModel = await _schedulerCenter.AddScheduleJobAsync(model); - data.success = ResuleModel.success; - if (ResuleModel.success) + data.Success = ResuleModel.Success; + if (ResuleModel.Success) { - data.msg = $"{data.msg}=>启动成功=>{ResuleModel.msg}"; + data.Message = $"{data.Message}=>启动成功=>{ResuleModel.Message}"; } else { - data.msg = $"{data.msg}=>启动失败=>{ResuleModel.msg}"; + data.Message = $"{data.Message}=>启动失败=>{ResuleModel.Message}"; } } else { - data.msg = "更新失败"; + data.Message = "更新失败"; } } catch (Exception) @@ -252,7 +252,7 @@ namespace Tiobon.Core.Controllers } finally { - if (data.success) + if (data.Success) _unitOfWorkManage.CommitTran(); else _unitOfWorkManage.RollbackTran(); @@ -260,7 +260,7 @@ namespace Tiobon.Core.Controllers } else { - data.msg = "任务不存在"; + data.Message = "任务不存在"; } return data; } @@ -278,29 +278,29 @@ namespace Tiobon.Core.Controllers if (model != null) { model.IsStart = false; - data.success = await _tasksQzServices.Update(model); - data.response = jobId.ObjToString(); - if (data.success) + data.Success = await _tasksQzServices.Update(model); + data.Data = jobId.ObjToString(); + if (data.Success) { - data.msg = "更新成功"; + data.Message = "更新成功"; var ResuleModel = await _schedulerCenter.StopScheduleJobAsync(model); - if (ResuleModel.success) + if (ResuleModel.Success) { - data.msg = $"{data.msg}=>停止成功=>{ResuleModel.msg}"; + data.Message = $"{data.Message}=>停止成功=>{ResuleModel.Message}"; } else { - data.msg = $"{data.msg}=>停止失败=>{ResuleModel.msg}"; + data.Message = $"{data.Message}=>停止失败=>{ResuleModel.Message}"; } } else { - data.msg = "更新失败"; + data.Message = "更新失败"; } } else { - data.msg = "任务不存在"; + data.Message = "任务不存在"; } return data; } @@ -319,25 +319,25 @@ namespace Tiobon.Core.Controllers _unitOfWorkManage.BeginTran(); try { - data.success = await _tasksQzServices.Update(model); - data.response = jobId.ObjToString(); - if (data.success) + data.Success = await _tasksQzServices.Update(model); + data.Data = jobId.ObjToString(); + if (data.Success) { - data.msg = "更新成功"; + data.Message = "更新成功"; var ResuleModel = await _schedulerCenter.PauseJob(model); - if (ResuleModel.success) + if (ResuleModel.Success) { - data.msg = $"{data.msg}=>暂停成功=>{ResuleModel.msg}"; + data.Message = $"{data.Message}=>暂停成功=>{ResuleModel.Message}"; } else { - data.msg = $"{data.msg}=>暂停失败=>{ResuleModel.msg}"; + data.Message = $"{data.Message}=>暂停失败=>{ResuleModel.Message}"; } - data.success = ResuleModel.success; + data.Success = ResuleModel.Success; } else { - data.msg = "更新失败"; + data.Message = "更新失败"; } } catch (Exception) @@ -346,7 +346,7 @@ namespace Tiobon.Core.Controllers } finally { - if (data.success) + if (data.Success) _unitOfWorkManage.CommitTran(); else _unitOfWorkManage.RollbackTran(); @@ -354,7 +354,7 @@ namespace Tiobon.Core.Controllers } else { - data.msg = "任务不存在"; + data.Message = "任务不存在"; } return data; } @@ -375,25 +375,25 @@ namespace Tiobon.Core.Controllers try { model.IsStart = true; - data.success = await _tasksQzServices.Update(model); - data.response = jobId.ObjToString(); - if (data.success) + data.Success = await _tasksQzServices.Update(model); + data.Data = jobId.ObjToString(); + if (data.Success) { - data.msg = "更新成功"; + data.Message = "更新成功"; var ResuleModel = await _schedulerCenter.ResumeJob(model); - if (ResuleModel.success) + if (ResuleModel.Success) { - data.msg = $"{data.msg}=>恢复成功=>{ResuleModel.msg}"; + data.Message = $"{data.Message}=>恢复成功=>{ResuleModel.Message}"; } else { - data.msg = $"{data.msg}=>恢复失败=>{ResuleModel.msg}"; + data.Message = $"{data.Message}=>恢复失败=>{ResuleModel.Message}"; } - data.success = ResuleModel.success; + data.Success = ResuleModel.Success; } else { - data.msg = "更新失败"; + data.Message = "更新失败"; } } catch (Exception) @@ -402,7 +402,7 @@ namespace Tiobon.Core.Controllers } finally { - if (data.success) + if (data.Success) _unitOfWorkManage.CommitTran(); else _unitOfWorkManage.RollbackTran(); @@ -410,7 +410,7 @@ namespace Tiobon.Core.Controllers } else { - data.msg = "任务不存在"; + data.Message = "任务不存在"; } return data; } @@ -431,29 +431,29 @@ namespace Tiobon.Core.Controllers try { model.IsStart = true; - data.success = await _tasksQzServices.Update(model); - data.response = jobId.ObjToString(); - if (data.success) + data.Success = await _tasksQzServices.Update(model); + data.Data = jobId.ObjToString(); + if (data.Success) { - data.msg = "更新成功"; + data.Message = "更新成功"; var ResuleModelStop = await _schedulerCenter.StopScheduleJobAsync(model); var ResuleModelStar = await _schedulerCenter.AddScheduleJobAsync(model); - if (ResuleModelStar.success) + if (ResuleModelStar.Success) { - data.msg = $"{data.msg}=>停止:{ResuleModelStop.msg}=>启动:{ResuleModelStar.msg}"; - data.response = jobId.ObjToString(); + data.Message = $"{data.Message}=>停止:{ResuleModelStop.Message}=>启动:{ResuleModelStar.Message}"; + data.Data = jobId.ObjToString(); } else { - data.msg = $"{data.msg}=>停止:{ResuleModelStop.msg}=>启动:{ResuleModelStar.msg}"; - data.response = jobId.ObjToString(); + data.Message = $"{data.Message}=>停止:{ResuleModelStop.Message}=>启动:{ResuleModelStar.Message}"; + data.Data = jobId.ObjToString(); } - data.success = ResuleModelStar.success; + data.Success = ResuleModelStar.Success; } else { - data.msg = "更新失败"; + data.Message = "更新失败"; } } catch (Exception) @@ -462,7 +462,7 @@ namespace Tiobon.Core.Controllers } finally { - if (data.success) + if (data.Success) _unitOfWorkManage.CommitTran(); else _unitOfWorkManage.RollbackTran(); @@ -470,7 +470,7 @@ namespace Tiobon.Core.Controllers } else { - data.msg = "任务不存在"; + data.Message = "任务不存在"; } return data; @@ -510,7 +510,7 @@ namespace Tiobon.Core.Controllers } else { - data.msg = "任务不存在"; + data.Message = "任务不存在"; } return data; } @@ -522,7 +522,7 @@ namespace Tiobon.Core.Controllers public async Task>> 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 ServiceResult>.Message(model.dataCount >= 0, "获取成功", model); + return ServiceResult>.OprateSuccess(model.dataCount >= 0, "获取成功", model); } /// /// 任务概况 @@ -532,7 +532,7 @@ namespace Tiobon.Core.Controllers public async Task> 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 ServiceResult.Message(true, "获取成功", model); + return ServiceResult.OprateSuccess(true, "获取成功", model); } } diff --git a/Tiobon.Core.Api/Controllers/TopicController.cs b/Tiobon.Core.Api/Controllers/TopicController.cs index 66205cf0..24f03dbd 100644 --- a/Tiobon.Core.Api/Controllers/TopicController.cs +++ b/Tiobon.Core.Api/Controllers/TopicController.cs @@ -27,11 +27,11 @@ [HttpGet] public async Task>> Get() { - var data = new ServiceResult> {response = await _topicServices.GetTopics()}; - if (data.response != null) + var data = new ServiceResult> { Data = await _topicServices.GetTopics() }; + if (data.Data != null) { - data.success = true; - data.msg = ""; + data.Success = true; + data.Message = ""; } return data; } diff --git a/Tiobon.Core.Api/Controllers/TopicDetailController.cs b/Tiobon.Core.Api/Controllers/TopicDetailController.cs index 66da3a69..bb01e623 100644 --- a/Tiobon.Core.Api/Controllers/TopicDetailController.cs +++ b/Tiobon.Core.Api/Controllers/TopicDetailController.cs @@ -59,9 +59,9 @@ return new ServiceResult>() { - msg = "获取成功", - success = data.dataCount >= 0, - response = data + Message = "获取成功", + Success = data.dataCount >= 0, + Data = data }; } @@ -78,11 +78,11 @@ { var data = new ServiceResult(); var response = id > 0 ? await _topicDetailServices.QueryById(id) : new TopicDetail(); - data.response = (response?.tdIsDelete).ObjToBool() ? new TopicDetail() : response; - if (data.response != null) + data.Data = (response?.tdIsDelete).ObjToBool() ? new TopicDetail() : response; + if (data.Data != null) { - data.success = true; - data.msg = ""; + data.Success = true; + data.Message = ""; } return data; @@ -107,11 +107,11 @@ topicDetail.tdTop = 0; var id = (await _topicDetailServices.Add(topicDetail)); - data.success = id > 0; - if (data.success) + data.Success = id > 0; + if (data.Success) { - data.response = id.ObjToString(); - data.msg = "添加成功"; + data.Data = id.ObjToString(); + data.Message = "添加成功"; } return data; @@ -129,11 +129,11 @@ var data = new ServiceResult(); if (topicDetail != null && topicDetail.Id > 0) { - data.success = await _topicDetailServices.Update(topicDetail); - if (data.success) + data.Success = await _topicDetailServices.Update(topicDetail); + if (data.Success) { - data.msg = "更新成功"; - data.response = topicDetail?.Id.ObjToString(); + data.Message = "更新成功"; + data.Data = topicDetail?.Id.ObjToString(); } } @@ -154,11 +154,11 @@ { var topicDetail = await _topicDetailServices.QueryById(id); topicDetail.tdIsDelete = true; - data.success = await _topicDetailServices.Update(topicDetail); - if (data.success) + data.Success = await _topicDetailServices.Update(topicDetail); + if (data.Success) { - data.msg = "删除成功"; - data.response = topicDetail?.Id.ObjToString(); + data.Message = "删除成功"; + data.Data = topicDetail?.Id.ObjToString(); } } diff --git a/Tiobon.Core.Api/Controllers/TransactionController.cs b/Tiobon.Core.Api/Controllers/TransactionController.cs index 10fb859c..fffacacf 100644 --- a/Tiobon.Core.Api/Controllers/TransactionController.cs +++ b/Tiobon.Core.Api/Controllers/TransactionController.cs @@ -80,9 +80,9 @@ return new ServiceResult>() { - success = true, - msg = "操作完成", - response = returnMsg + Success = true, + Message = "操作完成", + Data = returnMsg }; } diff --git a/Tiobon.Core.Api/Controllers/UserController.cs b/Tiobon.Core.Api/Controllers/UserController.cs index a1c87fdc..45c56694 100644 --- a/Tiobon.Core.Api/Controllers/UserController.cs +++ b/Tiobon.Core.Api/Controllers/UserController.cs @@ -138,9 +138,9 @@ namespace Tiobon.Core.Controllers var userinfo = await _sysUserInfoServices.QueryById(tokenModel.Uid); if (userinfo != null) { - data.response = _mapper.Map(userinfo); - data.success = true; - data.msg = "获取成功"; + data.Data = _mapper.Map(userinfo); + data.Success = true; + data.Message = "获取成功"; } } } @@ -163,11 +163,11 @@ namespace Tiobon.Core.Controllers sysUserInfo.uRemark = _user.Name; var id = await _sysUserInfoServices.Add(_mapper.Map(sysUserInfo)); - data.success = id > 0; - if (data.success) + data.Success = id > 0; + if (data.Success) { - data.response = id.ObjToString(); - data.msg = "添加成功"; + data.Data = id.ObjToString(); + data.Message = "添加成功"; } return data; @@ -229,14 +229,14 @@ namespace Tiobon.Core.Controllers await _userRoleServices.Add(userRolsAdd); } - data.success = await _sysUserInfoServices.Update(oldUser); + data.Success = await _sysUserInfoServices.Update(oldUser); _unitOfWorkManage.CommitTran(); - if (data.success) + if (data.Success) { - data.msg = "更新成功"; - data.response = oldUser.Id.ObjToString(); + data.Message = "更新成功"; + data.Data = oldUser.Id.ObjToString(); } } catch (Exception e) @@ -262,11 +262,11 @@ namespace Tiobon.Core.Controllers { var userDetail = await _sysUserInfoServices.QueryById(id); userDetail.IsDeleted = true; - data.success = await _sysUserInfoServices.Update(userDetail); - if (data.success) + data.Success = await _sysUserInfoServices.Update(userDetail); + if (data.Success) { - data.msg = "删除成功"; - data.response = userDetail?.Id.ObjToString(); + data.Message = "删除成功"; + data.Data = userDetail?.Id.ObjToString(); } } diff --git a/Tiobon.Core.Api/Controllers/UserRoleController.cs b/Tiobon.Core.Api/Controllers/UserRoleController.cs index 974d48cd..8bfd360c 100644 --- a/Tiobon.Core.Api/Controllers/UserRoleController.cs +++ b/Tiobon.Core.Api/Controllers/UserRoleController.cs @@ -43,9 +43,9 @@ var userInfo = await _sysUserInfoServices.SaveUserInfo(loginName, loginPwd); return new ServiceResult() { - success = true, - msg = "添加成功", - response = _mapper.Map(userInfo) + Success = true, + Message = "添加成功", + Data = _mapper.Map(userInfo) }; } @@ -59,9 +59,9 @@ { return new ServiceResult() { - success = true, - msg = "添加成功", - response = await _roleServices.SaveRole(roleName) + Success = true, + Message = "添加成功", + Data = await _roleServices.SaveRole(roleName) }; } @@ -76,9 +76,9 @@ { return new ServiceResult() { - success = true, - msg = "添加成功", - response = await _userRoleServices.SaveUserRole(uid, rid) + Success = true, + Message = "添加成功", + Data = await _userRoleServices.SaveUserRole(uid, rid) }; } diff --git a/Tiobon.Core.Api/Controllers/ValuesController.cs b/Tiobon.Core.Api/Controllers/ValuesController.cs index 2916cdfc..79947cee 100644 --- a/Tiobon.Core.Api/Controllers/ValuesController.cs +++ b/Tiobon.Core.Api/Controllers/ValuesController.cs @@ -117,8 +117,8 @@ namespace Tiobon.Core.Controllers { return new ServiceResult>() { - success = true, - response = (_user.GetClaimsIdentity().ToList()).Select(d => + Success = true, + Data = (_user.GetClaimsIdentity().ToList()).Select(d => new ClaimDto { Type = d.Type, @@ -291,9 +291,9 @@ namespace Tiobon.Core.Controllers var getUserInfoByToken = _user.GetUserInfoFromToken(ClaimType); return new ServiceResult>() { - success = _user.IsAuthenticated(), - msg = _user.IsAuthenticated() ? _user.Name.ObjToString() : "未登录", - response = _user.GetClaimValueByType(ClaimType) + Success = _user.IsAuthenticated(), + Message = _user.IsAuthenticated() ? _user.Name.ObjToString() : "未登录", + Data = _user.GetClaimValueByType(ClaimType) }; } diff --git a/Tiobon.Core.Api/Controllers/WeChatCompanyController.cs b/Tiobon.Core.Api/Controllers/WeChatCompanyController.cs index ac457b29..bb017d7d 100644 --- a/Tiobon.Core.Api/Controllers/WeChatCompanyController.cs +++ b/Tiobon.Core.Api/Controllers/WeChatCompanyController.cs @@ -16,18 +16,18 @@ namespace Tiobon.Core.Controllers public WeChatCompanyController(IWeChatCompanyServices iWeChatCompanyServices) { _WeChatCompanyServices = iWeChatCompanyServices; - } + } /// /// 获取 /// /// 分页条件 /// - [HttpGet] + [HttpGet] public async Task>> Get([FromQuery] PaginationModel pagination) - { + { var data = await _WeChatCompanyServices.QueryPage(pagination); - return new ServiceResult> { success = true, response = data}; - } + return new ServiceResult> { Success = true, Data = data }; + } /// /// 获取(id) /// @@ -37,8 +37,8 @@ namespace Tiobon.Core.Controllers public async Task> Get(string id) { var data = await _WeChatCompanyServices.QueryById(id); - return new ServiceResult { success = true, response = data }; - } + return new ServiceResult { Success = true, Data = data }; + } /// /// 添加 /// @@ -47,7 +47,7 @@ namespace Tiobon.Core.Controllers public async Task> Post([FromBody] WeChatCompany obj) { await _WeChatCompanyServices.Add(obj); - return new ServiceResult { success = true}; + return new ServiceResult { Success = true }; } /// /// 更新 @@ -57,7 +57,7 @@ namespace Tiobon.Core.Controllers public async Task> Put([FromBody] WeChatCompany obj) { await _WeChatCompanyServices.Update(obj); - return new ServiceResult { success = true}; + return new ServiceResult { Success = true }; } /// /// 删除 @@ -67,7 +67,7 @@ namespace Tiobon.Core.Controllers public async Task> Delete(string id) { await _WeChatCompanyServices.DeleteById(id); - return new ServiceResult { success = true}; + return new ServiceResult { Success = true }; } /// /// 批量删除 @@ -78,7 +78,7 @@ namespace Tiobon.Core.Controllers { var i = ids.Split(","); await _WeChatCompanyServices.DeleteByIds(i); - return new ServiceResult { success = true }; + return new ServiceResult { Success = true }; } } diff --git a/Tiobon.Core.Api/Controllers/WeChatConfigController.cs b/Tiobon.Core.Api/Controllers/WeChatConfigController.cs index b558564f..6283e397 100644 --- a/Tiobon.Core.Api/Controllers/WeChatConfigController.cs +++ b/Tiobon.Core.Api/Controllers/WeChatConfigController.cs @@ -16,18 +16,18 @@ namespace Tiobon.Core.Controllers public WeChatConfigController(IWeChatConfigServices iWeChatConfigServices) { _WeChatConfigServices = iWeChatConfigServices; - } + } /// /// 获取 /// /// 分页条件 /// - [HttpGet] + [HttpGet] public async Task>> Get([FromQuery] PaginationModel pagination) - { + { var data = await _WeChatConfigServices.QueryPage(pagination); - return new ServiceResult> { success = true, response = data}; - } + return new ServiceResult> { Success = true, Data = data }; + } /// /// 获取(id) /// @@ -37,8 +37,8 @@ namespace Tiobon.Core.Controllers public async Task> Get(string id) { var data = await _WeChatConfigServices.QueryById(id); - return new ServiceResult { success = true, response = data }; - } + return new ServiceResult { Success = true, Data = data }; + } /// /// 添加 /// @@ -47,7 +47,7 @@ namespace Tiobon.Core.Controllers public async Task> Post([FromBody] WeChatConfig obj) { await _WeChatConfigServices.Add(obj); - return new ServiceResult { success = true}; + return new ServiceResult { Success = true }; } /// /// 更新 @@ -57,7 +57,7 @@ namespace Tiobon.Core.Controllers public async Task> Put([FromBody] WeChatConfig obj) { await _WeChatConfigServices.Update(obj); - return new ServiceResult { success = true}; + return new ServiceResult { Success = true }; } /// /// 删除 @@ -67,7 +67,7 @@ namespace Tiobon.Core.Controllers public async Task> Delete(string id) { await _WeChatConfigServices.DeleteById(id); - return new ServiceResult { success = true}; + return new ServiceResult { Success = true }; } /// /// 批量删除 @@ -78,7 +78,7 @@ namespace Tiobon.Core.Controllers { var i = ids.Split(","); await _WeChatConfigServices.DeleteByIds(i); - return new ServiceResult { success = true }; + return new ServiceResult { Success = true }; } } diff --git a/Tiobon.Core.Api/Controllers/WeChatPushLogController.cs b/Tiobon.Core.Api/Controllers/WeChatPushLogController.cs index ae1cac58..649341ab 100644 --- a/Tiobon.Core.Api/Controllers/WeChatPushLogController.cs +++ b/Tiobon.Core.Api/Controllers/WeChatPushLogController.cs @@ -16,18 +16,18 @@ namespace Tiobon.Core.Controllers public WeChatPushLogController(IWeChatPushLogServices iWeChatPushLogServices) { _WeChatPushLogServices = iWeChatPushLogServices; - } + } /// /// 获取 /// /// 分页条件 /// - [HttpGet] + [HttpGet] public async Task>> Get([FromQuery] PaginationModel pagination) - { + { var data = await _WeChatPushLogServices.QueryPage(pagination); - return new ServiceResult> { success = true, response = data}; - } + return new ServiceResult> { Success = true, Data = data }; + } /// /// 获取(id) /// @@ -37,8 +37,8 @@ namespace Tiobon.Core.Controllers public async Task> Get(string id) { var data = await _WeChatPushLogServices.QueryById(id); - return new ServiceResult { success = true, response = data }; - } + return new ServiceResult { Success = true, Data = data }; + } /// /// 添加 /// @@ -47,7 +47,7 @@ namespace Tiobon.Core.Controllers public async Task> Post([FromBody] WeChatPushLog obj) { await _WeChatPushLogServices.Add(obj); - return new ServiceResult { success = true}; + return new ServiceResult { Success = true }; } /// /// 更新 @@ -57,7 +57,7 @@ namespace Tiobon.Core.Controllers public async Task> Put([FromBody] WeChatPushLog obj) { await _WeChatPushLogServices.Update(obj); - return new ServiceResult { success = true}; + return new ServiceResult { Success = true }; } /// /// 删除 @@ -67,7 +67,7 @@ namespace Tiobon.Core.Controllers public async Task> Delete(string id) { await _WeChatPushLogServices.DeleteById(id); - return new ServiceResult { success = true}; + return new ServiceResult { Success = true }; } /// /// 批量删除 @@ -78,7 +78,7 @@ namespace Tiobon.Core.Controllers { var i = ids.Split(","); await _WeChatPushLogServices.DeleteByIds(i); - return new ServiceResult { success = true }; + return new ServiceResult { Success = true }; } } diff --git a/Tiobon.Core.Api/Controllers/WeChatSubController.cs b/Tiobon.Core.Api/Controllers/WeChatSubController.cs index e334e12e..8b931bde 100644 --- a/Tiobon.Core.Api/Controllers/WeChatSubController.cs +++ b/Tiobon.Core.Api/Controllers/WeChatSubController.cs @@ -16,18 +16,18 @@ namespace Tiobon.Core.Controllers public WeChatSubController(IWeChatSubServices iWeChatSubServices) { _WeChatSubServices = iWeChatSubServices; - } + } /// /// 获取 /// /// 分页条件 /// - [HttpGet] + [HttpGet] public async Task>> Get([FromQuery] PaginationModel pagination) - { + { var data = await _WeChatSubServices.QueryPage(pagination); - return new ServiceResult> { success = true, response = data}; - } + return new ServiceResult> { Success = true, Data = data }; + } /// /// 获取(id) /// @@ -37,8 +37,8 @@ namespace Tiobon.Core.Controllers public async Task> Get(string id) { var data = await _WeChatSubServices.QueryById(id); - return new ServiceResult { success = true, response = data }; - } + return new ServiceResult { Success = true, Data = data }; + } /// /// 添加 /// @@ -47,7 +47,7 @@ namespace Tiobon.Core.Controllers public async Task> Post([FromBody] WeChatSub obj) { await _WeChatSubServices.Add(obj); - return new ServiceResult { success = true}; + return new ServiceResult { Success = true }; } /// /// 更新 @@ -57,7 +57,7 @@ namespace Tiobon.Core.Controllers public async Task> Put([FromBody] WeChatSub obj) { await _WeChatSubServices.Update(obj); - return new ServiceResult { success = true}; + return new ServiceResult { Success = true }; } /// /// 删除 @@ -67,7 +67,7 @@ namespace Tiobon.Core.Controllers public async Task> Delete(string id) { await _WeChatSubServices.DeleteById(id); - return new ServiceResult { success = true}; + return new ServiceResult { Success = true }; } /// /// 批量删除 @@ -78,7 +78,7 @@ namespace Tiobon.Core.Controllers { var i = ids.Split(","); await _WeChatSubServices.DeleteByIds(i); - return new ServiceResult { success = true }; + return new ServiceResult { Success = true }; } } diff --git a/Tiobon.Core.Api/Filter/GlobalExceptionFilter.cs b/Tiobon.Core.Api/Filter/GlobalExceptionFilter.cs index 6efe348d..e2c1971b 100644 --- a/Tiobon.Core.Api/Filter/GlobalExceptionFilter.cs +++ b/Tiobon.Core.Api/Filter/GlobalExceptionFilter.cs @@ -25,28 +25,28 @@ namespace Tiobon.Core.Filter { var json = new ServiceResult(); - json.msg = context.Exception.Message;//错误信息 - json.status = 500;//500异常 + json.Message = context.Exception.Message;//错误信息 + json.Status = 500;//500异常 var errorAudit = "Unable to resolve service for"; - if (!string.IsNullOrEmpty(json.msg) && json.msg.Contains(errorAudit)) + if (!string.IsNullOrEmpty(json.Message) && json.Message.Contains(errorAudit)) { - json.msg = json.msg.Replace(errorAudit, $"（若新添加服务，需要重新编译项目）{errorAudit}"); + json.Message = json.Message.Replace(errorAudit, $"（若新添加服务，需要重新编译项目）{errorAudit}"); } if (_env.EnvironmentName.ObjToString().Equals("Development")) { - json.msgDev = context.Exception.StackTrace;//堆栈信息 + json.MessageDev = context.Exception.StackTrace;//堆栈信息 } var res = new ContentResult(); res.Content = JsonHelper.GetJSON>(json); context.Result = res; - MiniProfiler.Current.CustomTiming("Errors：", json.msg); + MiniProfiler.Current.CustomTiming("Errors：", json.Message); //进行错误日志记录 - _loggerHelper.LogError(json.msg + WriteLog(json.msg, context.Exception)); + _loggerHelper.LogError(json.Message + WriteLog(json.Message, context.Exception)); if (AppSettings.app(new string[] { "Middleware", "SignalRSendLog", "Enabled" }).ObjToBool()) { _hubContext.Clients.All.SendAsync("ReceiveUpdate", LogLock.GetLogData()).Wait(); diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 658cd595..e4db998d 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -2128,27 +2128,27 @@ 服务层响应实体(泛型) - + 状态码 - + 操作是否成功 - + 返回信息 - + 开发者信息 - + 返回数据集合 @@ -2157,39 +2157,39 @@ 返回成功 - 消息 + 消息 返回成功 - 消息 - 数据 + 消息 + 数据 返回失败 - 消息 + 消息 返回失败 - 消息 - 数据 + 消息 + 数据 - + 返回消息 失败/成功 - 消息 - 数据 + 消息 + 数据 @@ -2197,22 +2197,22 @@ 服务层响应实体 - + 状态码 - + 操作是否成功 - + 返回信息 - + 返回数据集合 diff --git a/Tiobon.Core.Extensions/Authorizations/Policys/ApiResponseHandler.cs b/Tiobon.Core.Extensions/Authorizations/Policys/ApiResponseHandler.cs index 1f404ae8..1851c16b 100644 --- a/Tiobon.Core.Extensions/Authorizations/Policys/ApiResponseHandler.cs +++ b/Tiobon.Core.Extensions/Authorizations/Policys/ApiResponseHandler.cs @@ -37,7 +37,7 @@ namespace Tiobon.Core.AuthHelper Response.ContentType = "application/json"; if (_user.MessageModel != null) { - Response.StatusCode = _user.MessageModel.status; + Response.StatusCode = _user.MessageModel.Status; await Response.WriteAsync(JsonConvert.SerializeObject(_user.MessageModel)); } else diff --git a/Tiobon.Core.Extensions/Authorizations/Policys/PermissionHandler.cs b/Tiobon.Core.Extensions/Authorizations/Policys/PermissionHandler.cs index 95087c58..a2e5f359 100644 --- a/Tiobon.Core.Extensions/Authorizations/Policys/PermissionHandler.cs +++ b/Tiobon.Core.Extensions/Authorizations/Policys/PermissionHandler.cs @@ -143,21 +143,21 @@ namespace Tiobon.Core.AuthHelper if (user == null) { _user.MessageModel = new ApiResponse(StatusCode.CODE401, "用户不存在或已被删除").MessageModel; - context.Fail(new AuthorizationFailureReason(this, _user.MessageModel.msg)); + context.Fail(new AuthorizationFailureReason(this, _user.MessageModel.Message)); return; } if (user.IsDeleted) { _user.MessageModel = new ApiResponse(StatusCode.CODE401, "用户已被删除,禁止登陆!").MessageModel; - context.Fail(new AuthorizationFailureReason(this, _user.MessageModel.msg)); + context.Fail(new AuthorizationFailureReason(this, _user.MessageModel.Message)); return; } if (!user.Enable) { _user.MessageModel = new ApiResponse(StatusCode.CODE401, "用户已被禁用!禁止登陆!").MessageModel; - context.Fail(new AuthorizationFailureReason(this, _user.MessageModel.msg)); + context.Fail(new AuthorizationFailureReason(this, _user.MessageModel.Message)); return; } } @@ -200,7 +200,7 @@ namespace Tiobon.Core.AuthHelper { _user.MessageModel = new ApiResponse(StatusCode.CODE401, "很抱歉,授权已失效,请重新授权") .MessageModel; - context.Fail(new AuthorizationFailureReason(this, _user.MessageModel.msg)); + context.Fail(new AuthorizationFailureReason(this, _user.MessageModel.Message)); return; } } diff --git a/Tiobon.Core.Extensions/HostedService/QuartzJobHostedService.cs b/Tiobon.Core.Extensions/HostedService/QuartzJobHostedService.cs index e0e9c76c..5798f8db 100644 --- a/Tiobon.Core.Extensions/HostedService/QuartzJobHostedService.cs +++ b/Tiobon.Core.Extensions/HostedService/QuartzJobHostedService.cs @@ -40,13 +40,13 @@ public class QuartzJobHostedService : IHostedService if (item.IsStart) { var result = await _schedulerCenter.AddScheduleJobAsync(item); - if (result.success) + if (result.Success) { Console.WriteLine($"QuartzNetJob{item.Name}启动成功！"); } else { - Console.WriteLine($"QuartzNetJob{item.Name}启动失败！错误信息：{result.msg}"); + Console.WriteLine($"QuartzNetJob{item.Name}启动失败！错误信息：{result.Message}"); } } } diff --git a/Tiobon.Core.Gateway/Controllers/UserController.cs b/Tiobon.Core.Gateway/Controllers/UserController.cs index e16f5bf5..5e2df322 100644 --- a/Tiobon.Core.Gateway/Controllers/UserController.cs +++ b/Tiobon.Core.Gateway/Controllers/UserController.cs @@ -23,8 +23,8 @@ namespace Tiobon.Core.Gateway.Controllers { return new ServiceResult>() { - success = true, - response = (_user.GetClaimsIdentity().ToList()).Select(d => + Success = true, + Data = (_user.GetClaimsIdentity().ToList()).Select(d => new ClaimDto { Type = d.Type, diff --git a/Tiobon.Core.Model/ApiResponse.cs b/Tiobon.Core.Model/ApiResponse.cs index 1e4c604a..b8a03802 100644 --- a/Tiobon.Core.Model/ApiResponse.cs +++ b/Tiobon.Core.Model/ApiResponse.cs @@ -38,9 +38,9 @@ MessageModel = new ServiceResult() { - status = Status, - msg = Value, - success = apiCode == StatusCode.CODE200 + Status = Status, + Message = Value, + Success = apiCode == StatusCode.CODE200 }; } } diff --git a/Tiobon.Core.Model/ServiceResult.cs b/Tiobon.Core.Model/ServiceResult.cs index dae711d2..cf75f7fd 100644 --- a/Tiobon.Core.Model/ServiceResult.cs +++ b/Tiobon.Core.Model/ServiceResult.cs @@ -10,73 +10,73 @@ public class ServiceResult /// /// 状态码 /// - public int status { get; set; } = 200; + public int Status { get; set; } = 200; /// /// 操作是否成功 /// - public bool success { get; set; } = false; + public bool Success { get; set; } = false; /// /// 返回信息 /// - public string msg { get; set; } = ""; + public string Message { get; set; } = ""; /// /// 开发者信息 /// - public string msgDev { get; set; } + public string MessageDev { get; set; } /// /// 返回数据集合 /// - public T response { get; set; } + public T Data { get; set; } /// /// 返回成功 /// - /// 消息 + /// 消息 /// - public static ServiceResult OprateSuccess(string msg) + public static ServiceResult OprateSuccess(string message) { - return Message(true, msg, default); + return OprateSuccess(true, message, default); } /// /// 返回成功 /// - /// 消息 - /// 数据 + /// 消息 + /// 数据 /// - public static ServiceResult OprateSuccess(string msg, T response) + public static ServiceResult OprateSuccess(string message, T data) { - return Message(true, msg, response); + return OprateSuccess(true, message, data); } /// /// 返回失败 /// - /// 消息 + /// 消息 /// - public static ServiceResult OprateFailed(string msg) + public static ServiceResult OprateFailed(string message) { - return Message(false, msg, default); + return OprateSuccess(false, message, default); } /// /// 返回失败 /// - /// 消息 - /// 数据 + /// 消息 + /// 数据 /// - public static ServiceResult OprateFailed(string msg, T response) + public static ServiceResult OprateFailed(string message, T data) { - return Message(false, msg, response); + return OprateSuccess(false, message, data); } /// /// 返回消息 /// /// 失败/成功 - /// 消息 - /// 数据 + /// 消息 + /// 数据 /// - public static ServiceResult Message(bool success, string msg, T response) + public static ServiceResult OprateSuccess(bool success, string message, T data) { - return new ServiceResult() { msg = msg, response = response, success = success }; + return new ServiceResult() { Message = message, Data = data, Success = success }; } } @@ -88,19 +88,19 @@ public class ServiceResult /// /// 状态码 /// - public int status { get; set; } = 200; + public int Status { get; set; } = 200; /// /// 操作是否成功 /// - public bool success { get; set; } = false; + public bool Success { get; set; } = false; /// /// 返回信息 /// - public string msg { get; set; } = ""; + public string Message { get; set; } = ""; /// /// 返回数据集合 /// - public object response { get; set; } + public object Data { get; set; } /// /// 操作成功 @@ -111,9 +111,9 @@ public class ServiceResult { return new ServiceResult { - msg = msg, - success = true, - response = null + Message = msg, + Success = true, + Data = null }; } @@ -127,9 +127,9 @@ public class ServiceResult { return new ServiceResult { - msg = msg, - status = status, - response = null + Message = msg, + Status = status, + Data = null }; } } diff --git a/Tiobon.Core.Services/GuestbookServices.cs b/Tiobon.Core.Services/GuestbookServices.cs index 3744a6c4..91c690cf 100644 --- a/Tiobon.Core.Services/GuestbookServices.cs +++ b/Tiobon.Core.Services/GuestbookServices.cs @@ -74,8 +74,8 @@ namespace Tiobon.Core.Services return new ServiceResult() { - success = true, - msg = "操作完成" + Success = true, + Message = "操作完成" }; } catch (Exception) @@ -88,8 +88,8 @@ namespace Tiobon.Core.Services return new ServiceResult() { - success = false, - msg = "操作异常" + Success = false, + Message = "操作异常" }; } } diff --git a/Tiobon.Core.Services/PayServices.cs b/Tiobon.Core.Services/PayServices.cs index d7fd1756..5f0df040 100644 --- a/Tiobon.Core.Services/PayServices.cs +++ b/Tiobon.Core.Services/PayServices.cs @@ -32,7 +32,7 @@ namespace Tiobon.Core.Services { _logger.LogInformation("支付开始"); ServiceResult messageModel = new ServiceResult(); - messageModel.response = new PayReturnResultModel(); + messageModel.Data = new PayReturnResultModel(); string url = string.Empty; string param = string.Empty; string returnData = string.Empty; @@ -130,18 +130,18 @@ namespace Tiobon.Core.Services string strCheckPars = StringHelper.GetPars(dicCheckPars); if (NotifyCheck(strCheckPars, payResult.SIGN, StaticPayInfo.pubKey)) { - messageModel.success = true; - messageModel.msg = "支付成功"; + messageModel.Success = true; + messageModel.Message = "支付成功"; } else { - messageModel.success = false; - messageModel.msg = "签名失败"; + messageModel.Success = false; + messageModel.Message = "签名失败"; } break; case "N": - messageModel.success = false; - messageModel.msg = "支付失败"; + messageModel.Success = false; + messageModel.Message = "支付失败"; break; case "U": case "Q": @@ -152,22 +152,22 @@ namespace Tiobon.Core.Services messageModel = await PayCheck(payModel, 1); break; default: - messageModel.success = false; - messageModel.msg = "支付失败"; + messageModel.Success = false; + messageModel.Message = "支付失败"; break; } - messageModel.response.ORDERID = payResult.ORDERID; - messageModel.response.ERRCODE = payResult.ERRCODE; - messageModel.response.ERRMSG = payResult.ERRMSG; - messageModel.response.TRACEID = payResult.TRACEID; - messageModel.response.AMOUNT = payResult.AMOUNT; - messageModel.response.QRCODETYPE = payResult.QRCODETYPE; + messageModel.Data.ORDERID = payResult.ORDERID; + messageModel.Data.ERRCODE = payResult.ERRCODE; + messageModel.Data.ERRMSG = payResult.ERRMSG; + messageModel.Data.TRACEID = payResult.TRACEID; + messageModel.Data.AMOUNT = payResult.AMOUNT; + messageModel.Data.QRCODETYPE = payResult.QRCODETYPE; } catch (Exception ex) { - messageModel.success = false; - messageModel.msg = "服务错误"; - messageModel.response.ERRMSG = ex.Message; + messageModel.Success = false; + messageModel.Message = "服务错误"; + messageModel.Data.ERRMSG = ex.Message; _logger.LogInformation($"异常信息:{ex.Message}"); _logger.LogInformation($"异常堆栈:{ex.StackTrace}"); } @@ -182,7 +182,7 @@ namespace Tiobon.Core.Services { _logger.LogInformation("退款开始"); ServiceResult messageModel = new ServiceResult(); - messageModel.response = new PayRefundReturnResultModel(); + messageModel.Data = new PayRefundReturnResultModel(); try { _logger.LogInformation($"原始GET参数->{_httpContextAccessor.HttpContext.Request.QueryString}"); @@ -223,31 +223,31 @@ namespace Tiobon.Core.Services var Xmlresult = XmlHelper.ParseFormByXml(sResult, "TX"); if (Xmlresult.RETURN_CODE.Equals("000000")) { - messageModel.success = true; - messageModel.msg = "退款成功"; + messageModel.Success = true; + messageModel.Message = "退款成功"; } else { - messageModel.success = false; - messageModel.msg = "退款失败"; + messageModel.Success = false; + messageModel.Message = "退款失败"; } - messageModel.response.RETURN_MSG = Xmlresult.RETURN_MSG; - messageModel.response.TX_CODE = Xmlresult.TX_CODE; - messageModel.response.REQUEST_SN = Xmlresult.REQUEST_SN; - messageModel.response.RETURN_CODE = Xmlresult.RETURN_CODE; - messageModel.response.CUST_ID = Xmlresult.CUST_ID; - messageModel.response.LANGUAGE = Xmlresult.LANGUAGE; - - messageModel.response.AMOUNT = Xmlresult.TX_INFO?.AMOUNT; - messageModel.response.PAY_AMOUNT = Xmlresult.TX_INFO?.PAY_AMOUNT; - messageModel.response.ORDER_NUM = Xmlresult.TX_INFO?.ORDER_NUM; + messageModel.Data.RETURN_MSG = Xmlresult.RETURN_MSG; + messageModel.Data.TX_CODE = Xmlresult.TX_CODE; + messageModel.Data.REQUEST_SN = Xmlresult.REQUEST_SN; + messageModel.Data.RETURN_CODE = Xmlresult.RETURN_CODE; + messageModel.Data.CUST_ID = Xmlresult.CUST_ID; + messageModel.Data.LANGUAGE = Xmlresult.LANGUAGE; + + messageModel.Data.AMOUNT = Xmlresult.TX_INFO?.AMOUNT; + messageModel.Data.PAY_AMOUNT = Xmlresult.TX_INFO?.PAY_AMOUNT; + messageModel.Data.ORDER_NUM = Xmlresult.TX_INFO?.ORDER_NUM; request.Dispose(); } catch (Exception ex) { - messageModel.success = false; - messageModel.msg = "服务错误"; - messageModel.response.RETURN_MSG = ex.Message; + messageModel.Success = false; + messageModel.Message = "服务错误"; + messageModel.Data.RETURN_MSG = ex.Message; _logger.LogInformation($"异常信息:{ex.Message}"); _logger.LogInformation($"异常堆栈:{ex.StackTrace}"); } @@ -265,7 +265,7 @@ namespace Tiobon.Core.Services _logger.LogInformation("轮询开始"); ServiceResult messageModel = new ServiceResult(); - messageModel.response = new PayReturnResultModel(); + messageModel.Data = new PayReturnResultModel(); string url = string.Empty; string param = string.Empty; string returnData = string.Empty; @@ -357,18 +357,18 @@ namespace Tiobon.Core.Services string strCheckPars = StringHelper.GetPars(dicCheckPars); if (NotifyCheck(strCheckPars, payResult.SIGN, StaticPayInfo.pubKey)) { - messageModel.success = true; - messageModel.msg = "支付成功"; + messageModel.Success = true; + messageModel.Message = "支付成功"; } else { - messageModel.success = false; - messageModel.msg = "签名失败"; + messageModel.Success = false; + messageModel.Message = "签名失败"; } break; case "N": - messageModel.success = false; - messageModel.msg = "支付失败"; + messageModel.Success = false; + messageModel.Message = "支付失败"; break; case "U": case "Q": @@ -379,22 +379,22 @@ namespace Tiobon.Core.Services messageModel = await PayCheck(payModel, ++times); break; default: - messageModel.success = false; - messageModel.msg = "支付失败"; + messageModel.Success = false; + messageModel.Message = "支付失败"; break; } - messageModel.response.ORDERID = payResult.ORDERID; - messageModel.response.ERRCODE = payResult.ERRCODE; - messageModel.response.ERRMSG = payResult.ERRMSG; - messageModel.response.TRACEID = payResult.TRACEID; - messageModel.response.AMOUNT = payResult.AMOUNT; - messageModel.response.QRCODETYPE = payResult.QRCODETYPE; + messageModel.Data.ORDERID = payResult.ORDERID; + messageModel.Data.ERRCODE = payResult.ERRCODE; + messageModel.Data.ERRMSG = payResult.ERRMSG; + messageModel.Data.TRACEID = payResult.TRACEID; + messageModel.Data.AMOUNT = payResult.AMOUNT; + messageModel.Data.QRCODETYPE = payResult.QRCODETYPE; } catch (Exception ex) { - messageModel.success = false; - messageModel.msg = "服务错误"; - messageModel.response.ERRMSG = ex.Message; + messageModel.Success = false; + messageModel.Message = "服务错误"; + messageModel.Data.ERRMSG = ex.Message; _logger.LogInformation($"异常信息:{ex.Message}"); _logger.LogInformation($"异常堆栈:{ex.StackTrace}"); } diff --git a/Tiobon.Core.Services/WeChatConfigServices.cs b/Tiobon.Core.Services/WeChatConfigServices.cs index 6e7693e0..fd619d8d 100644 --- a/Tiobon.Core.Services/WeChatConfigServices.cs +++ b/Tiobon.Core.Services/WeChatConfigServices.cs @@ -25,9 +25,9 @@ namespace Tiobon.Core.Services { this._unitOfWorkManage = unitOfWorkManage; this._logger = logger; - } + } public async Task> GetToken(string publicAccount) - { + { var config = await this.QueryById(publicAccount); if (config == null) ServiceResult.OprateSuccess($"公众号{publicAccount}未维护至系统");//还没过期,直接返回 if (config.tokenExpiration > DateTime.Now) @@ -44,11 +44,11 @@ namespace Tiobon.Core.Services config.token = data.access_token; config.tokenExpiration = DateTime.Now.AddSeconds(data.expires_in); await this.Update(config); - return ServiceResult.OprateSuccess("",data); + return ServiceResult.OprateSuccess("", data); } else { - return ServiceResult.OprateFailed($"\r\n获取Token失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}"); + return ServiceResult.OprateFailed($"\r\n获取Token失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}"); } } public async Task> RefreshToken(string publicAccount) @@ -72,15 +72,15 @@ namespace Tiobon.Core.Services public async Task> GetTemplate(string id) { var res = await GetToken(id); - if (!res.success) return res; - var data = await WeChatHelper.GetTemplate(res.response.access_token); + if (!res.Success) return res; + var data = await WeChatHelper.GetTemplate(res.Data.access_token); if (data.errcode.Equals(0)) { - return ServiceResult.OprateSuccess("", data); + return ServiceResult.OprateSuccess("", data); } else { - return ServiceResult.OprateSuccess($"\r\n获取模板失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}", data); + return ServiceResult.OprateSuccess($"\r\n获取模板失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}", data); } } /// @@ -91,8 +91,8 @@ namespace Tiobon.Core.Services public async Task> GetMenu(string id) { var res = await GetToken(id); - if (!res.success) return res; - var data = await WeChatHelper.GetMenu(res.response.access_token); + if (!res.Success) return res; + var data = await WeChatHelper.GetMenu(res.Data.access_token); if (data.errcode.Equals(0)) { return ServiceResult.OprateSuccess("", data); @@ -105,14 +105,14 @@ namespace Tiobon.Core.Services public async Task> GetSubUsers(string id) { var res = await GetToken(id); - if (!res.success) return res; - var data = await WeChatHelper.GetUsers(res.response.access_token); + if (!res.Success) return res; + var data = await WeChatHelper.GetUsers(res.Data.access_token); if (data.errcode.Equals(0)) { data.users = new List(); foreach (var openid in data.data.openid) { - data.users.Add(await WeChatHelper.GetUserInfo(res.response.access_token, openid)); + data.users.Add(await WeChatHelper.GetUserInfo(res.Data.access_token, openid)); } return ServiceResult.OprateSuccess("", data); } @@ -121,11 +121,11 @@ namespace Tiobon.Core.Services return ServiceResult.OprateSuccess($"\r\n获取订阅用户失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}", data); } } - public async Task> GetSubUser(string id,string openid) + public async Task> 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); + var res = await GetToken(id); + if (!res.Success) return res; + var data = await WeChatHelper.GetUserInfo(res.Data.access_token, openid); if (data.errcode.Equals(0)) { return ServiceResult.OprateSuccess("", data); @@ -135,8 +135,8 @@ namespace Tiobon.Core.Services return ServiceResult.OprateSuccess($"\r\n获取订阅用户失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}", data); } } - public async Task Valid(WeChatValidDto validDto,string body) - { + public async Task Valid(WeChatValidDto validDto, string body) + { WeChatXMLDto weChatData = null; string objReturn = null; try @@ -204,9 +204,9 @@ namespace Tiobon.Core.Services return objReturn; } public async Task> GetQRBind(WeChatUserInfo info) - { + { var res = await GetToken(info?.id); - if (!res.success) return ServiceResult.OprateFailed(res.msg); + if (!res.Success) return ServiceResult.OprateFailed(res.Message); var push = new WeChatQRDto { expire_seconds = 604800, @@ -223,7 +223,7 @@ namespace Tiobon.Core.Services reData.companyCode = info.companyCode; reData.id = info.id; var pushJosn = JsonHelper.GetJSON(push); - var data = await WeChatHelper.GetQRCode(res.response.access_token, pushJosn); + var data = await WeChatHelper.GetQRCode(res.Data.access_token, pushJosn); WeChatQR weChatQR = new WeChatQR { QRbindCompanyID = info.companyCode, @@ -232,23 +232,23 @@ namespace Tiobon.Core.Services QRcrateTime = DateTime.Now, QRpublicAccount = info.id, QRticket = data.ticket - }; + }; data.id = info.userID; await this.BaseDal.Db.Insertable(weChatQR).ExecuteCommandAsync(); - reData.usersData= data; + reData.usersData = data; return ServiceResult.OprateSuccess("获取二维码成功", reData); } - public async Task> PushCardMsg(WeChatCardMsgDataDto msg,string ip) - { + public async Task> PushCardMsg(WeChatCardMsgDataDto msg, string ip) + { var bindUser = await BaseDal.Db.Queryable().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 ServiceResult.OprateFailed("用户不存在或者已经解绑!"); var res = await GetToken(msg?.info?.id); - if(!res.success) - return ServiceResult.OprateFailed(res.msg); + if (!res.Success) + return ServiceResult.OprateFailed(res.Message); WeChatResponseUserInfo reData = new WeChatResponseUserInfo(); reData.companyCode = msg.info.companyCode; - reData.id = msg.info.id; + reData.id = msg.info.id; try { var pushData = new WeChatPushCardMsgDto @@ -296,7 +296,7 @@ namespace Tiobon.Core.Services } }; var pushJson = JsonHelper.GetJSON(pushData); - var data = await WeChatHelper.SendCardMsg(res.response.access_token, pushJson); + var data = await WeChatHelper.SendCardMsg(res.Data.access_token, pushJson); reData.usersData = data; try { @@ -327,27 +327,28 @@ namespace Tiobon.Core.Services { return ServiceResult.OprateSuccess("卡片消息推送失败", reData); } - + } catch (Exception ex) - { - return ServiceResult.OprateSuccess($"卡片消息推送错误=>{ex.Message}", reData); + { + return ServiceResult.OprateSuccess($"卡片消息推送错误=>{ex.Message}", reData); } - + } - public async Task> PushTxtMsg(WeChatPushTestDto msg) { + public async Task> PushTxtMsg(WeChatPushTestDto msg) + { var res = await GetToken(msg.selectWeChat); - if (!res.success) return res; - var token = res.response.access_token; + if (!res.Success) return res; + var token = res.Data.access_token; if (msg.selectBindOrSub.Equals("sub")) - { + { return await PushText(token, msg); } else { ServiceResult messageModel = new ServiceResult(); - messageModel.success = true; + messageModel.Success = true; //绑定用户 if (msg.selectOperate.Equals("one")) { @@ -357,11 +358,11 @@ namespace Tiobon.Core.Services { msg.selectUser = item.SubUserOpenID; var info = await PushText(token, msg); - if (!info.success) + if (!info.Success) { - messageModel.success = false; + messageModel.Success = false; } - messageModel.msg += info.msg; + messageModel.Message += info.Message; } } else @@ -372,18 +373,19 @@ namespace Tiobon.Core.Services { msg.selectUser = item.SubUserOpenID; var info = await PushText(token, msg); - if (!info.success) + if (!info.Success) { - messageModel.success = false; + messageModel.Success = false; } - messageModel.msg += info.msg; + messageModel.Message += info.Message; } } return messageModel; } - + } - public async Task> PushText(string token,WeChatPushTestDto msg) { + public async Task> PushText(string token, WeChatPushTestDto msg) + { object data = null; ; WeChatApiDto pushres = null; ; @@ -514,25 +516,25 @@ namespace Tiobon.Core.Services { WeChatHelper.ConverMenuButtonForEvent(menu); var res = await GetToken(menu.id); - if (!res.success) return res; - var data = await WeChatHelper.SetMenu(res.response.access_token, JsonHelper.ObjToJson(menu.menu)); + if (!res.Success) return res; + var data = await WeChatHelper.SetMenu(res.Data.access_token, JsonHelper.ObjToJson(menu.menu)); if (data.errcode.Equals(0)) { return ServiceResult.OprateSuccess("更新成功", data); } else - { + { return ServiceResult.OprateSuccess("更新失败", data); } } public async Task> GetBindUserInfo(WeChatUserInfo info) { - var bindUser = await BaseDal.Db.Queryable().Where(t => t.SubFromPublicAccount == info.id && t.CompanyID == info.companyCode && info.userID.Equals(t.SubJobID) && t.IsUnBind == false ).FirstAsync(); + var bindUser = await BaseDal.Db.Queryable().Where(t => t.SubFromPublicAccount == info.id && t.CompanyID == info.companyCode && info.userID.Equals(t.SubJobID) && t.IsUnBind == false).FirstAsync(); if (bindUser == null) return ServiceResult.OprateFailed("用户不存在或者已经解绑!"); var res = await GetToken(info.id); - if(!res.success) return ServiceResult.OprateFailed(res.msg); - var token = res.response.access_token; + if (!res.Success) return ServiceResult.OprateFailed(res.Message); + var token = res.Data.access_token; WeChatResponseUserInfo reData = new WeChatResponseUserInfo(); reData.companyCode = info.companyCode; reData.id = info.id; @@ -545,18 +547,18 @@ namespace Tiobon.Core.Services else { return ServiceResult.OprateFailed("用户信息获取失败", reData); - } + } } public async Task> UnBind(WeChatUserInfo info) - { - var bindUser = await BaseDal.Db.Queryable().Where(t => t.SubFromPublicAccount == info.id && t.CompanyID == info.companyCode && info.userID.Equals(t.SubJobID) && t.IsUnBind == false ).FirstAsync(); + { + var bindUser = await BaseDal.Db.Queryable().Where(t => t.SubFromPublicAccount == info.id && t.CompanyID == info.companyCode && info.userID.Equals(t.SubJobID) && t.IsUnBind == false).FirstAsync(); if (bindUser == null) return ServiceResult.OprateFailed("用户不存在或者已经解绑!"); WeChatResponseUserInfo reData = new WeChatResponseUserInfo(); reData.companyCode = info.companyCode; reData.id = info.id; bindUser.IsUnBind = true; bindUser.SubUserRefTime = DateTime.Now; - await BaseDal.Db.Updateable(bindUser).UpdateColumns(t=> new{ t.IsUnBind,t.SubUserRefTime}).ExecuteCommandAsync(); + await BaseDal.Db.Updateable(bindUser).UpdateColumns(t => new { t.IsUnBind, t.SubUserRefTime }).ExecuteCommandAsync(); return ServiceResult.OprateSuccess("用户解绑成功", reData); } @@ -792,7 +794,7 @@ namespace Tiobon.Core.Services /// private async Task QRBind(WeChatXMLDto weChat) - { + { var ticket = await BaseDal.Db.Queryable().InSingleAsync(weChat.Ticket); if (ticket == null) throw new Exception("ticket未找到"); if (ticket.QRisUsed) throw new Exception("ticket已被使用"); @@ -800,7 +802,7 @@ namespace Tiobon.Core.Services var bindUser = await BaseDal.Db.Queryable().Where(t => t.SubFromPublicAccount == ticket.QRpublicAccount && t.CompanyID == ticket.QRbindCompanyID && t.SubJobID == ticket.QRbindJobID).SingleAsync(); bool isNewBind; - if (bindUser == null ) + if (bindUser == null) { isNewBind = true; bindUser = new WeChatSub diff --git a/Tiobon.Core.Tasks/QuartzNet/SchedulerCenterServer.cs b/Tiobon.Core.Tasks/QuartzNet/SchedulerCenterServer.cs index dba470db..7af1976d 100644 --- a/Tiobon.Core.Tasks/QuartzNet/SchedulerCenterServer.cs +++ b/Tiobon.Core.Tasks/QuartzNet/SchedulerCenterServer.cs @@ -56,14 +56,14 @@ namespace Tiobon.Core.Tasks //等待任务运行完成 await this._scheduler.Result.Start(); await Console.Out.WriteLineAsync("任务调度开启！"); - result.success = true; - result.msg = $"任务调度开启成功"; + result.Success = true; + result.Message = $"任务调度开启成功"; return result; } else { - result.success = false; - result.msg = $"任务调度已经开启"; + result.Success = false; + result.Message = $"任务调度已经开启"; return result; } } @@ -87,14 +87,14 @@ namespace Tiobon.Core.Tasks //等待任务运行完成 await this._scheduler.Result.Shutdown(); await Console.Out.WriteLineAsync("任务调度停止！"); - result.success = true; - result.msg = $"任务调度停止成功"; + result.Success = true; + result.Message = $"任务调度停止成功"; return result; } else { - result.success = false; - result.msg = $"任务调度已经停止"; + result.Success = false; + result.Message = $"任务调度已经停止"; return result; } } @@ -121,14 +121,14 @@ namespace Tiobon.Core.Tasks JobKey jobKey = new JobKey(tasksQz.Id.ToString(), tasksQz.JobGroup); if (await _scheduler.Result.CheckExists(jobKey)) { - result.success = false; - result.msg = $"该任务计划已经在执行:【{tasksQz.Name}】,请勿重复启动！"; + result.Success = false; + result.Message = $"该任务计划已经在执行:【{tasksQz.Name}】,请勿重复启动！"; return result; } if(tasksQz.TriggerType == 0 && tasksQz.CycleRunTimes != 0 && tasksQz.CycleHasRunTimes>=tasksQz.CycleRunTimes) { - result.success = false; - result.msg = $"该任务计划已完成:【{tasksQz.Name}】,无需重复启动,如需启动请修改已循环次数再提交"; + result.Success = false; + result.Message = $"该任务计划已完成:【{tasksQz.Name}】,无需重复启动,如需启动请修改已循环次数再提交"; return result; } #region 设置开始时间和结束时间 @@ -185,21 +185,21 @@ namespace Tiobon.Core.Tasks //await Task.Delay(TimeSpan.FromSeconds(120)); //await Console.Out.WriteLineAsync("关闭了调度器！"); //await _scheduler.Result.Shutdown(); - result.success = true; - result.msg = $"【{tasksQz.Name}】成功"; + result.Success = true; + result.Message = $"【{tasksQz.Name}】成功"; return result; } catch (Exception ex) { - result.success = false; - result.msg = $"任务计划异常:【{ex.Message}】"; + result.Success = false; + result.Message = $"任务计划异常:【{ex.Message}】"; return result; } } else { - result.success = false; - result.msg = $"任务计划不存在:【{tasksQz?.Name}】"; + result.Success = false; + result.Message = $"任务计划不存在:【{tasksQz?.Name}】"; return result; } } @@ -232,15 +232,15 @@ namespace Tiobon.Core.Tasks JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup); if (!await _scheduler.Result.CheckExists(jobKey)) { - result.success = false; - result.msg = $"未找到要暂停的任务:【{sysSchedule.Name}】"; + result.Success = false; + result.Message = $"未找到要暂停的任务:【{sysSchedule.Name}】"; return result; } else { await this._scheduler.Result.DeleteJob(jobKey); - result.success = true; - result.msg = $"【{sysSchedule.Name}】成功"; + result.Success = true; + result.Message = $"【{sysSchedule.Name}】成功"; return result; } } @@ -263,13 +263,13 @@ namespace Tiobon.Core.Tasks JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup); if (!await _scheduler.Result.CheckExists(jobKey)) { - result.success = false; - result.msg = $"未找到要恢复的任务:【{sysSchedule.Name}】"; + result.Success = false; + result.Message = $"未找到要恢复的任务:【{sysSchedule.Name}】"; return result; } await this._scheduler.Result.ResumeJob(jobKey); - result.success = true; - result.msg = $"【{sysSchedule.Name}】成功"; + result.Success = true; + result.Message = $"【{sysSchedule.Name}】成功"; return result; } catch (Exception) @@ -290,13 +290,13 @@ namespace Tiobon.Core.Tasks JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup); if (!await _scheduler.Result.CheckExists(jobKey)) { - result.success = false; - result.msg = $"未找到要暂停的任务:【{sysSchedule.Name}】"; + result.Success = false; + result.Message = $"未找到要暂停的任务:【{sysSchedule.Name}】"; return result; } await this._scheduler.Result.PauseJob(jobKey); - result.success = true; - result.msg = $"【{sysSchedule.Name}】成功"; + result.Success = true; + result.Message = $"【{sysSchedule.Name}】成功"; return result; } catch (Exception) @@ -474,19 +474,19 @@ namespace Tiobon.Core.Tasks //停止任务 await StopScheduleJobAsync(tasksQz); - result.success = true; - result.msg = $"立即执行计划任务:【{tasksQz.Name}】成功"; + result.Success = true; + result.Message = $"立即执行计划任务:【{tasksQz.Name}】成功"; } else { await _scheduler.Result.TriggerJob(jobKey); - result.success = true; - result.msg = $"立即执行计划任务:【{tasksQz.Name}】成功"; + result.Success = true; + result.Message = $"立即执行计划任务:【{tasksQz.Name}】成功"; } } catch (Exception ex) { - result.msg = $"立即执行计划任务失败:【{ex.Message}】"; + result.Message = $"立即执行计划任务失败:【{ex.Message}】"; } return result; diff --git a/Tiobon.Core.Tests/Controller_Test/BlogController_Should.cs b/Tiobon.Core.Tests/Controller_Test/BlogController_Should.cs index 070ad4fd..b2154b59 100644 --- a/Tiobon.Core.Tests/Controller_Test/BlogController_Should.cs +++ b/Tiobon.Core.Tests/Controller_Test/BlogController_Should.cs @@ -46,8 +46,8 @@ namespace Tiobon.Core.Tests { ServiceResult> Tiobons = await TiobonController.Get(1, 1, "技术博文", ""); Assert.NotNull(Tiobons); - Assert.NotNull(Tiobons.response); - Assert.True(Tiobons.response.dataCount >= 0); + Assert.NotNull(Tiobons.Data); + Assert.True(Tiobons.Data.dataCount >= 0); } [Fact] @@ -80,9 +80,9 @@ namespace Tiobon.Core.Tests ServiceResult> Tiobons = await TiobonController.GetTiobonsByTypesForMVP("技术博文"); Assert.NotNull(Tiobons); - Assert.True(Tiobons.success); - Assert.NotNull(Tiobons.response); - Assert.True(Tiobons.response.Count >= 0); + Assert.True(Tiobons.Success); + Assert.NotNull(Tiobons.Data); + Assert.True(Tiobons.Data.Count >= 0); } [Fact] @@ -91,8 +91,8 @@ namespace Tiobon.Core.Tests ServiceResult Tiobon = await TiobonController.GetTiobonByIdForMVP(1); Assert.NotNull(Tiobon); - Assert.True(Tiobon.success); - Assert.NotNull(Tiobon.response); + Assert.True(Tiobon.Success); + Assert.NotNull(Tiobon.Data); } [Fact] @@ -108,9 +108,9 @@ namespace Tiobon.Core.Tests var res = await TiobonController.Post(TiobonArticle); - Assert.True(res.success); + Assert.True(res.Success); - var data = res.response; + var data = res.Data; Assert.NotNull(data); } @@ -128,9 +128,9 @@ namespace Tiobon.Core.Tests var res = await TiobonController.AddForMVP(TiobonArticle); - Assert.True(res.success); + Assert.True(res.Success); - var data = res.response; + var data = res.Data; Assert.NotNull(data); } @@ -149,9 +149,9 @@ namespace Tiobon.Core.Tests var res = await TiobonController.Put(TiobonArticle); - Assert.True(res.success); + Assert.True(res.Success); - var data = res.response; + var data = res.Data; Assert.NotNull(data); } @@ -161,9 +161,9 @@ namespace Tiobon.Core.Tests { var res = await TiobonController.Delete(99); - Assert.False(res.success); + Assert.False(res.Success); - var data = res.response; + var data = res.Data; Assert.Null(data); } @@ -173,7 +173,7 @@ namespace Tiobon.Core.Tests { var res = await TiobonController.ApacheTestUpdate(); - Assert.True(res.success); + Assert.True(res.Success); } } }