Simon
/
Tiobon.Web.Core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码优化

Browse Source
master
xiaochanghai 1 year ago
parent 9e7797362c
commit 8840200874
33 changed files with 591 additions and 588 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      Tiobon.Core.Api/Controllers/BaseApiController.cs
  2. 35
      Tiobon.Core.Api/Controllers/BaseController.cs
  3. 64
      Tiobon.Core.Api/Controllers/DbFirst/DbFirstController.cs
  4. 30
      Tiobon.Core.Api/Controllers/DbFirst/MigrateController.cs
  5. 46
      Tiobon.Core.Api/Controllers/DepartmentController.cs
  6. 16
      Tiobon.Core.Api/Controllers/LoginController.cs
  7. 30
      Tiobon.Core.Api/Controllers/NacosController.cs
  8. 52
      Tiobon.Core.Api/Controllers/PermissionController.cs
  9. 40
      Tiobon.Core.Api/Controllers/SplitDemoController.cs
  10. 174
      Tiobon.Core.Api/Controllers/TasksQzController.cs
  11. 8
      Tiobon.Core.Api/Controllers/TopicController.cs
  12. 38
      Tiobon.Core.Api/Controllers/TopicDetailController.cs
  13. 6
      Tiobon.Core.Api/Controllers/TransactionController.cs
  14. 30
      Tiobon.Core.Api/Controllers/UserController.cs
  15. 18
      Tiobon.Core.Api/Controllers/UserRoleController.cs
  16. 10
      Tiobon.Core.Api/Controllers/ValuesController.cs
  17. 12
      Tiobon.Core.Api/Controllers/WeChatCompanyController.cs
  18. 12
      Tiobon.Core.Api/Controllers/WeChatConfigController.cs
  19. 12
      Tiobon.Core.Api/Controllers/WeChatPushLogController.cs
  20. 12
      Tiobon.Core.Api/Controllers/WeChatSubController.cs
  21. 14
      Tiobon.Core.Api/Filter/GlobalExceptionFilter.cs
  22. 36
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  23. 2
      Tiobon.Core.Extensions/Authorizations/Policys/ApiResponseHandler.cs
  24. 8
      Tiobon.Core.Extensions/Authorizations/Policys/PermissionHandler.cs
  25. 4
      Tiobon.Core.Extensions/HostedService/QuartzJobHostedService.cs
  26. 4
      Tiobon.Core.Gateway/Controllers/UserController.cs
  27. 6
      Tiobon.Core.Model/ApiResponse.cs
  28. 66
      Tiobon.Core.Model/ServiceResult.cs
  29. 8
      Tiobon.Core.Services/GuestbookServices.cs
  30. 108
      Tiobon.Core.Services/PayServices.cs
  31. 78
      Tiobon.Core.Services/WeChatConfigServices.cs
  32. 70
      Tiobon.Core.Tasks/QuartzNet/SchedulerCenterServer.cs
  33. 32
      Tiobon.Core.Tests/Controller_Test/BlogController_Should.cs

12
Tiobon.Core.Api/Controllers/BaseApiController.cs
Unescape View File

@ -7,7 +7,7 @@ namespace Tiobon.Core.Controllers
[NonAction] [NonAction]
public ServiceResult<T> Success<T>(T data, string msg = "成功") public ServiceResult<T> Success<T>(T data, string msg = "成功")
{ {
return new ServiceResult<T>() { success = true, msg = msg, response = data, }; return new ServiceResult<T>() { Success = true, Message = msg, Data = data, };
} }
// [NonAction] // [NonAction]
@ -23,31 +23,31 @@ namespace Tiobon.Core.Controllers
[NonAction] [NonAction]
public ServiceResult Success(string msg = "成功") public ServiceResult Success(string msg = "成功")
{ {
return new ServiceResult() { success = true, msg = msg, response = null, }; return new ServiceResult() { Success = true, Message = msg, Data = null, };
} }
[NonAction] [NonAction]
public ServiceResult<string> Failed(string msg = "失败", int status = 500) public ServiceResult<string> Failed(string msg = "失败", int status = 500)
{ {
return new ServiceResult<string>() { success = false, status = status, msg = msg, response = null, }; return new ServiceResult<string>() { Success = false, Status = status, Message = msg, Data = null, };
} }
[NonAction] [NonAction]
public ServiceResult<T> Failed<T>(string msg = "失败", int status = 500) public ServiceResult<T> Failed<T>(string msg = "失败", int status = 500)
{ {
return new ServiceResult<T>() { success = false, status = status, msg = msg, response = default, }; return new ServiceResult<T>() { Success = false, Status = status, Message = msg, Data = default, };
} }
[NonAction] [NonAction]
public ServiceResult<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 ServiceResult<PageModel<T>>() { success = true, msg = msg, response = new PageModel<T>(page, dataCount, pageSize, data) }; return new ServiceResult<PageModel<T>>() { Success = true, Message = msg, Data = new PageModel<T>(page, dataCount, pageSize, data) };
} }
[NonAction] [NonAction]
public ServiceResult<PageModel<T>> SuccessPage<T>(PageModel<T> pageModel, string msg = "获取成功") public ServiceResult<PageModel<T>> SuccessPage<T>(PageModel<T> pageModel, string msg = "获取成功")
{ {
return new ServiceResult<PageModel<T>>() { success = true, msg = msg, response = pageModel }; return new ServiceResult<PageModel<T>>() { Success = true, Message = msg, Data = pageModel };
} }
} }
} }

35
Tiobon.Core.Api/Controllers/BaseController.cs
Unescape View File

@ -1,4 +1,5 @@
using System.Reflection; using System.Reflection;
using Confluent.Kafka;
namespace Tiobon.Core.Controllers; namespace Tiobon.Core.Controllers;
@ -66,9 +67,9 @@ public class BaseController<IServiceBase, TEntity, TEntityDto, TInsertDto, TEdit
{ {
var data = Success<string>(null, "新增成功"); var data = Success<string>(null, "新增成功");
var id = Convert.ToInt64(await InvokeServiceAsync("Add", [insertModel])); var id = Convert.ToInt64(await InvokeServiceAsync("Add", [insertModel]));
data.success = id > 0; data.Success = id > 0;
if (data.success) if (data.Success)
data.response = id.ObjToString(); data.Data = id.ObjToString();
else else
return Failed<string>("新增失败"); return Failed<string>("新增失败");
@ -107,8 +108,8 @@ public class BaseController<IServiceBase, TEntity, TEntityDto, TInsertDto, TEdit
var isExist = Convert.ToBoolean(await InvokeServiceAsync("AnyAsync", [Id])); var isExist = Convert.ToBoolean(await InvokeServiceAsync("AnyAsync", [Id]));
if (!isExist) if (!isExist)
return Failed("删除失败"); return Failed("删除失败");
data.success = Convert.ToBoolean(await InvokeServiceAsync("DeleteById1", [Id])); data.Success = Convert.ToBoolean(await InvokeServiceAsync("DeleteById1", [Id]));
if (!data.success) if (!data.Success)
return Failed("删除失败"); return Failed("删除失败");
return data; return data;
} }
@ -148,9 +149,9 @@ public class BaseController<IServiceBase, TEntity, TEntityDto, TInsertDto, TEdit
} }
[NonAction] [NonAction]
public ServiceResult<T> Success<T>(T data, string msg = "成功") public ServiceResult<T> Success<T>(T data, string message = "成功")
{ {
return new ServiceResult<T>() { success = true, msg = msg, response = data, }; return new ServiceResult<T>() { Success = true, Message = message, Data = data, };
} }
// [NonAction] // [NonAction]
@ -164,32 +165,32 @@ public class BaseController<IServiceBase, TEntity, TEntityDto, TInsertDto, TEdit
// }; // };
//} //}
[NonAction] [NonAction]
public ServiceResult Success(string msg = "成功") public ServiceResult Success(string message = "成功")
{ {
return new ServiceResult() { success = true, msg = msg, response = null, }; return new ServiceResult() { Success = true, Message = message, Data = null, };
} }
[NonAction] [NonAction]
public ServiceResult Failed(string msg = "失败", int status = 500) public ServiceResult Failed(string message = "失败", int status = 500)
{ {
return new ServiceResult() { success = false, status = status, msg = msg, response = null, }; return new ServiceResult() { Success = false, Status = status, Message = message, Data = null, };
} }
[NonAction] [NonAction]
public ServiceResult<T> Failed<T>(string msg = "失败", int status = 500) public ServiceResult<T> Failed<T>(string message = "失败", int status = 500)
{ {
return new ServiceResult<T>() { success = false, status = status, msg = msg, response = default, }; return new ServiceResult<T>() { Success = false, Status = status, Message = message, Data = default, };
} }
[NonAction] [NonAction]
public ServiceResult<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 message = "获取成功")
{ {
return new ServiceResult<PageModel<T>>() { success = true, msg = msg, response = new PageModel<T>(page, dataCount, pageSize, data) }; return new ServiceResult<PageModel<T>>() { Success = true, Message = message, Data = new PageModel<T>(page, dataCount, pageSize, data) };
} }
[NonAction] [NonAction]
public ServiceResult<PageModel<T>> SuccessPage<T>(PageModel<T> pageModel, string msg = "获取成功") public ServiceResult<PageModel<T>> SuccessPage<T>(PageModel<T> pageModel, string message = "获取成功")
{ {
return new ServiceResult<PageModel<T>>() { success = true, msg = msg, response = pageModel }; return new ServiceResult<PageModel<T>>() { Success = true, Message = message, Data = pageModel };
} }
} }

64
Tiobon.Core.Api/Controllers/DbFirst/DbFirstController.cs
Unescape View File

@ -28,21 +28,21 @@ namespace Tiobon.Core.Controllers
[HttpGet] [HttpGet]
public ServiceResult<string> GetFrameFiles() public ServiceResult<string> GetFrameFiles()
{ {
var data = new ServiceResult<string>() { success = true, msg = "" }; var data = new ServiceResult<string>() { Success = true, Message = "" };
data.response += @"file path is:C:\my-file\}"; data.Data += @"file path is:C:\my-file\}";
var isMuti = BaseDBConfig.IsMulti; var isMuti = BaseDBConfig.IsMulti;
if (Env.IsDevelopment()) if (Env.IsDevelopment())
{ {
data.response += $"Controller层生成：{FrameSeed.CreateControllers(_sqlSugarClient)} || "; data.Data += $"Controller层生成：{FrameSeed.CreateControllers(_sqlSugarClient)} || ";
BaseDBConfig.ValidConfig.ForEach(m => BaseDBConfig.ValidConfig.ForEach(m =>
{ {
_sqlSugarClient.ChangeDatabase(m.ConfigId.ToLower()); _sqlSugarClient.ChangeDatabase(m.ConfigId.ToLower());
data.response += $"库{m.ConfigId}-Model层生成：{FrameSeed.CreateModels(_sqlSugarClient, m.ConfigId, isMuti)} || "; data.Data += $"库{m.ConfigId}-Model层生成：{FrameSeed.CreateModels(_sqlSugarClient, m.ConfigId, isMuti)} || ";
data.response += $"库{m.ConfigId}-IRepositorys层生成：{FrameSeed.CreateIRepositorys(_sqlSugarClient, m.ConfigId, isMuti)} || "; data.Data += $"库{m.ConfigId}-IRepositorys层生成：{FrameSeed.CreateIRepositorys(_sqlSugarClient, m.ConfigId, isMuti)} || ";
data.response += $"库{m.ConfigId}-IServices层生成：{FrameSeed.CreateIServices(_sqlSugarClient, m.ConfigId, isMuti)} || "; data.Data += $"库{m.ConfigId}-IServices层生成：{FrameSeed.CreateIServices(_sqlSugarClient, m.ConfigId, isMuti)} || ";
data.response += $"库{m.ConfigId}-Repository层生成：{FrameSeed.CreateRepository(_sqlSugarClient, m.ConfigId, isMuti)} || "; data.Data += $"库{m.ConfigId}-Repository层生成：{FrameSeed.CreateRepository(_sqlSugarClient, m.ConfigId, isMuti)} || ";
data.response += $"库{m.ConfigId}-Services层生成：{FrameSeed.CreateServices(_sqlSugarClient, m.ConfigId, isMuti)} || "; data.Data += $"库{m.ConfigId}-Services层生成：{FrameSeed.CreateServices(_sqlSugarClient, m.ConfigId, isMuti)} || ";
}); });
// 切回主库 // 切回主库
@ -50,8 +50,8 @@ namespace Tiobon.Core.Controllers
} }
else else
{ {
data.success = false; data.Success = false;
data.msg = "当前不处于开发模式，代码生成不可用！"; data.Message = "当前不处于开发模式，代码生成不可用！";
} }
return data; return data;
@ -69,18 +69,18 @@ namespace Tiobon.Core.Controllers
ConnID = ConnID == null ? MainDb.CurrentDbConnId.ToLower() : ConnID; ConnID = ConnID == null ? MainDb.CurrentDbConnId.ToLower() : ConnID;
var isMuti = BaseDBConfig.IsMulti; var isMuti = BaseDBConfig.IsMulti;
var data = new ServiceResult<string>() { success = true, msg = "" }; var data = new ServiceResult<string>() { Success = true, Message = "" };
if (Env.IsDevelopment()) if (Env.IsDevelopment())
{ {
data.response += $"库{ConnID}-IRepositorys层生成：{FrameSeed.CreateIRepositorys(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; data.Data += $"库{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.Data += $"库{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)} || ";
} }
else else
{ {
data.success = false; data.Success = false;
data.msg = "当前不处于开发模式，代码生成不可用！"; data.Message = "当前不处于开发模式，代码生成不可用！";
} }
return data; return data;
@ -97,15 +97,15 @@ namespace Tiobon.Core.Controllers
ConnID = ConnID == null ? MainDb.CurrentDbConnId.ToLower() : ConnID; ConnID = ConnID == null ? MainDb.CurrentDbConnId.ToLower() : ConnID;
var isMuti = BaseDBConfig.IsMulti; var isMuti = BaseDBConfig.IsMulti;
var data = new ServiceResult<string>() { success = true, msg = "" }; var data = new ServiceResult<string>() { Success = true, Message = "" };
if (Env.IsDevelopment()) if (Env.IsDevelopment())
{ {
data.response += $"库{ConnID}-Models层生成：{FrameSeed.CreateModels(_sqlSugarClient, ConnID, isMuti, tableNames)}"; data.Data += $"库{ConnID}-Models层生成：{FrameSeed.CreateModels(_sqlSugarClient, ConnID, isMuti, tableNames)}";
} }
else else
{ {
data.success = false; data.Success = false;
data.msg = "当前不处于开发模式，代码生成不可用！"; data.Message = "当前不处于开发模式，代码生成不可用！";
} }
return data; return data;
} }
@ -121,15 +121,15 @@ namespace Tiobon.Core.Controllers
ConnID = ConnID == null ? MainDb.CurrentDbConnId.ToLower() : ConnID; ConnID = ConnID == null ? MainDb.CurrentDbConnId.ToLower() : ConnID;
var isMuti = BaseDBConfig.IsMulti; var isMuti = BaseDBConfig.IsMulti;
var data = new ServiceResult<string>() { success = true, msg = "" }; var data = new ServiceResult<string>() { Success = true, Message = "" };
if (Env.IsDevelopment()) if (Env.IsDevelopment())
{ {
data.response += $"库{ConnID}-Controllers层生成：{FrameSeed.CreateControllers(_sqlSugarClient, ConnID, isMuti, tableNames)}"; data.Data += $"库{ConnID}-Controllers层生成：{FrameSeed.CreateControllers(_sqlSugarClient, ConnID, isMuti, tableNames)}";
} }
else else
{ {
data.success = false; data.Success = false;
data.msg = "当前不处于开发模式，代码生成不可用！"; data.Message = "当前不处于开发模式，代码生成不可用！";
} }
return data; return data;
} }
@ -148,23 +148,23 @@ namespace Tiobon.Core.Controllers
ConnID = ConnID == null ? MainDb.CurrentDbConnId.ToLower() : ConnID; ConnID = ConnID == null ? MainDb.CurrentDbConnId.ToLower() : ConnID;
var isMuti = BaseDBConfig.IsMulti; var isMuti = BaseDBConfig.IsMulti;
var data = new ServiceResult<string>() { success = true, msg = "" }; var data = new ServiceResult<string>() { Success = true, Message = "" };
if (Env.IsDevelopment()) if (Env.IsDevelopment())
{ {
_sqlSugarClient.ChangeDatabase(ConnID.ToLower()); _sqlSugarClient.ChangeDatabase(ConnID.ToLower());
data.response += $"Controller层生成：{FrameSeed.CreateControllers(_sqlSugarClient, ConnID, isMuti, tableNames)} || "; data.Data += $"Controller层生成：{FrameSeed.CreateControllers(_sqlSugarClient, ConnID, isMuti, tableNames)} || ";
data.response += $"库{ConnID}-Model层生成：{FrameSeed.CreateModels(_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}-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}-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()); _sqlSugarClient.ChangeDatabase(MainDb.CurrentDbConnId.ToLower());
} }
else else
{ {
data.success = false; data.Success = false;
data.msg = "当前不处于开发模式，代码生成不可用！"; data.Message = "当前不处于开发模式，代码生成不可用！";
} }
return data; return data;

30
Tiobon.Core.Api/Controllers/DbFirst/MigrateController.cs
Unescape View File

@ -48,7 +48,7 @@ namespace Tiobon.Core.Controllers
[HttpGet] [HttpGet]
public async Task<ServiceResult<string>> DataMigrateFromOld2New() public async Task<ServiceResult<string>> DataMigrateFromOld2New()
{ {
var data = new ServiceResult<string>() { success = true, msg = "" }; var data = new ServiceResult<string>() { Success = true, Message = "" };
var filterPermissionId = 122; var filterPermissionId = 122;
if (_env.IsDevelopment()) if (_env.IsDevelopment())
{ {
@ -123,8 +123,8 @@ namespace Tiobon.Core.Controllers
_unitOfWorkManage.CommitTran(); _unitOfWorkManage.CommitTran();
data.success = true; data.Success = true;
data.msg = "导入成功！"; data.Message = "导入成功！";
} }
catch (Exception) catch (Exception)
{ {
@ -134,8 +134,8 @@ namespace Tiobon.Core.Controllers
} }
else else
{ {
data.success = false; data.Success = false;
data.msg = "当前不处于开发模式，代码生成不可用！"; data.Message = "当前不处于开发模式，代码生成不可用！";
} }
return data; return data;
@ -149,7 +149,7 @@ namespace Tiobon.Core.Controllers
[HttpGet] [HttpGet]
public async Task<ServiceResult<string>> SaveData2TsvAsync() public async Task<ServiceResult<string>> SaveData2TsvAsync()
{ {
var data = new ServiceResult<string>() { success = true, msg = "" }; var data = new ServiceResult<string>() { Success = true, Message = "" };
if (_env.IsDevelopment()) if (_env.IsDevelopment())
{ {
@ -185,13 +185,13 @@ namespace Tiobon.Core.Controllers
data.success = true; data.Success = true;
data.msg = "生成成功！"; data.Message = "生成成功！";
} }
else else
{ {
data.success = false; data.Success = false;
data.msg = "当前不处于开发模式，代码生成不可用！"; data.Message = "当前不处于开发模式，代码生成不可用！";
} }
return data; return data;
@ -205,7 +205,7 @@ namespace Tiobon.Core.Controllers
[HttpGet] [HttpGet]
public async Task<ServiceResult<string>> SaveData2ExcelAsync() public async Task<ServiceResult<string>> SaveData2ExcelAsync()
{ {
var data = new ServiceResult<string>() { success = true, msg = "" }; var data = new ServiceResult<string>() { Success = true, Message = "" };
if (_env.IsDevelopment()) if (_env.IsDevelopment())
{ {
@ -245,13 +245,13 @@ namespace Tiobon.Core.Controllers
FileHelper.WriteFile(Path.Combine(_env.WebRootPath, "TiobonCore.Data.excel", "RoleModulePermission.xlsx"), RoleModulePermissionResult); FileHelper.WriteFile(Path.Combine(_env.WebRootPath, "TiobonCore.Data.excel", "RoleModulePermission.xlsx"), RoleModulePermissionResult);
data.success = true; data.Success = true;
data.msg = "生成成功！"; data.Message = "生成成功！";
} }
else else
{ {
data.success = false; data.Success = false;
data.msg = "当前不处于开发模式，代码生成不可用！"; data.Message = "当前不处于开发模式，代码生成不可用！";
} }
return data; return data;

46
Tiobon.Core.Api/Controllers/DepartmentController.cs
Unescape View File

@ -26,9 +26,9 @@
return new ServiceResult<PageModel<Department>>() return new ServiceResult<PageModel<Department>>()
{ {
msg = "获取成功", Message = "获取成功",
success = true, Success = true,
response = await _departmentServices.QueryPage(whereExpression, page, intPageSize) Data = await _departmentServices.QueryPage(whereExpression, page, intPageSize)
}; };
} }
@ -38,9 +38,9 @@
{ {
return new ServiceResult<Department>() return new ServiceResult<Department>()
{ {
msg = "获取成功", Message = "获取成功",
success = true, Success = true,
response = await _departmentServices.QueryById(id) Data = await _departmentServices.QueryById(id)
}; };
} }
@ -132,11 +132,11 @@
var data = new ServiceResult<string>(); var data = new ServiceResult<string>();
var id = await _departmentServices.Add(request); var id = await _departmentServices.Add(request);
data.success = id > 0; data.Success = id > 0;
if (data.success) if (data.Success)
{ {
data.response = id.ObjToString(); data.Data = id.ObjToString();
data.msg = "添加成功"; data.Message = "添加成功";
} }
return data; return data;
@ -146,11 +146,11 @@
public async Task<ServiceResult<string>> Put([FromBody] Department request) public async Task<ServiceResult<string>> Put([FromBody] Department request)
{ {
var data = new ServiceResult<string>(); var data = new ServiceResult<string>();
data.success = await _departmentServices.Update(request); data.Success = await _departmentServices.Update(request);
if (data.success) if (data.Success)
{ {
data.msg = "更新成功"; data.Message = "更新成功";
data.response = request?.Id.ObjToString(); data.Data = request?.Id.ObjToString();
} }
return data; return data;
@ -162,11 +162,11 @@
var data = new ServiceResult<string>(); var data = new ServiceResult<string>();
var model = await _departmentServices.QueryById(id); var model = await _departmentServices.QueryById(id);
model.IsDeleted = true; model.IsDeleted = true;
data.success = await _departmentServices.Update(model); data.Success = await _departmentServices.Update(model);
if (data.success) if (data.Success)
{ {
data.msg = "删除成功"; data.Message = "删除成功";
data.response = model?.Id.ObjToString(); data.Data = model?.Id.ObjToString();
} }
@ -177,7 +177,7 @@
[AllowAnonymous] [AllowAnonymous]
public async Task<ServiceResult<string>> SaveData2Tsv() public async Task<ServiceResult<string>> SaveData2Tsv()
{ {
var data = new ServiceResult<string>() { success = true, msg = "" }; var data = new ServiceResult<string>() { Success = true, Message = "" };
if (_env.IsDevelopment()) if (_env.IsDevelopment())
{ {
@ -189,13 +189,13 @@
var rolesJson = JsonConvert.SerializeObject(await _departmentServices.Query(d => d.IsDeleted == false), microsoftDateFormatSettings); 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); FileHelper.WriteFile(Path.Combine(_env.WebRootPath, "TiobonCore.Data.json", "Department_New.tsv"), rolesJson, Encoding.UTF8);
data.success = true; data.Success = true;
data.msg = "生成成功！"; data.Message = "生成成功！";
} }
else else
{ {
data.success = false; data.Success = false;
data.msg = "当前不处于开发模式，代码生成不可用！"; data.Message = "当前不处于开发模式，代码生成不可用！";
} }
return data; return data;

16
Tiobon.Core.Api/Controllers/LoginController.cs
Unescape View File

@ -76,9 +76,9 @@ namespace Tiobon.Core.Controllers
return new ServiceResult<string>() return new ServiceResult<string>()
{ {
success = suc, Success = suc,
msg = suc ? "获取成功" : "获取失败", Message = suc ? "获取成功" : "获取失败",
response = jwtStr Data = jwtStr
}; };
} }
@ -120,9 +120,9 @@ namespace Tiobon.Core.Controllers
return new ServiceResult<string>() return new ServiceResult<string>()
{ {
success = suc, Success = suc,
msg = suc ? "获取成功" : "获取失败", Message = suc ? "获取成功" : "获取失败",
response = jwtStr Data = jwtStr
}; };
} }
@ -305,10 +305,10 @@ namespace Tiobon.Core.Controllers
try try
{ {
var result = await GetJwtToken3(loginRequest.name, loginRequest.pwd); var result = await GetJwtToken3(loginRequest.name, loginRequest.pwd);
if (result.success) if (result.Success)
{ {
HttpContext.SuccessSwagger(); HttpContext.SuccessSwagger();
HttpContext.SuccessSwaggerJwt(result.response.token); HttpContext.SuccessSwaggerJwt(result.Data.token);
return new {result = true}; return new {result = true};
} }
} }

30
Tiobon.Core.Api/Controllers/NacosController.cs
Unescape View File

@ -45,8 +45,8 @@ namespace Tiobon.Core.Api.Controllers
// 然后再进行服务上线 // 然后再进行服务上线
var data = new ServiceResult<string>(); var data = new ServiceResult<string>();
// *************** 此处请求一下db 跟redis连接等 项目中简介 保证项目已全部启动 // *************** 此处请求一下db 跟redis连接等 项目中简介 保证项目已全部启动
data.success = true; data.Success = true;
data.msg = "SUCCESS"; data.Message = "SUCCESS";
return data; return data;
} }
@ -63,9 +63,9 @@ namespace Tiobon.Core.Api.Controllers
var instances = await NacosNamingService.GetAllInstances(JsonConfigSettings.NacosServiceName); var instances = await NacosNamingService.GetAllInstances(JsonConfigSettings.NacosServiceName);
if (instances == null || instances.Count == 0) if (instances == null || instances.Count == 0)
{ {
data.status = 406; data.Status = 406;
data.msg = "DOWN"; data.Message = "DOWN";
data.success = false; data.Success = false;
return data; return data;
} }
// 获取当前程序IP // 获取当前程序IP
@ -79,16 +79,16 @@ namespace Tiobon.Core.Api.Controllers
// var baseUrl = await NacosNamingService.GetServerStatus(); // var baseUrl = await NacosNamingService.GetServerStatus();
if (isUp) if (isUp)
{ {
data.status = 200; data.Status = 200;
data.msg = "UP"; data.Message = "UP";
data.success = true; data.Success = true;
return data; return data;
} }
else else
{ {
data.status = 406; data.Status = 406;
data.msg = "DOWN"; data.Message = "DOWN";
data.success = false; data.Success = false;
return data; return data;
} }
} }
@ -113,8 +113,8 @@ namespace Tiobon.Core.Api.Controllers
Metadata = JsonConfigSettings.NacosMetadata Metadata = JsonConfigSettings.NacosMetadata
}; };
await NacosNamingService.RegisterInstance(JsonConfigSettings.NacosServiceName, Nacos.V2.Common.Constants.DEFAULT_GROUP, instance); await NacosNamingService.RegisterInstance(JsonConfigSettings.NacosServiceName, Nacos.V2.Common.Constants.DEFAULT_GROUP, instance);
data.success = true; data.Success = true;
data.msg = "SUCCESS"; data.Message = "SUCCESS";
return data; return data;
} }
@ -127,8 +127,8 @@ namespace Tiobon.Core.Api.Controllers
{ {
var data = new ServiceResult<string>(); var data = new ServiceResult<string>();
await NacosNamingService.DeregisterInstance(JsonConfigSettings.NacosServiceName, Nacos.V2.Common.Constants.DEFAULT_GROUP, IpHelper.GetCurrentIp(null), JsonConfigSettings.NacosPort); await NacosNamingService.DeregisterInstance(JsonConfigSettings.NacosServiceName, Nacos.V2.Common.Constants.DEFAULT_GROUP, IpHelper.GetCurrentIp(null), JsonConfigSettings.NacosPort);
data.success = true; data.Success = true;
data.msg = "SUCCESS"; data.Message = "SUCCESS";
return data; return data;
} }
} }

52
Tiobon.Core.Api/Controllers/PermissionController.cs
Unescape View File

@ -411,11 +411,11 @@ namespace Tiobon.Core.Controllers
permissionTrees = permissionTrees.OrderBy(d => d.order).ToList(); permissionTrees = permissionTrees.OrderBy(d => d.order).ToList();
RecursionHelper.LoopNaviBarAppendChildren(permissionTrees, rootRoot); RecursionHelper.LoopNaviBarAppendChildren(permissionTrees, rootRoot);
data.success = true; data.Success = true;
if (data.success) if (data.Success)
{ {
data.response = rootRoot; data.Data = rootRoot;
data.msg = "获取成功"; data.Message = "获取成功";
} }
} }
} }
@ -499,11 +499,11 @@ namespace Tiobon.Core.Controllers
permissionTrees = permissionTrees.OrderBy(d => d.order).ToList(); permissionTrees = permissionTrees.OrderBy(d => d.order).ToList();
data.success = true; data.Success = true;
if (data.success) if (data.Success)
{ {
data.response = permissionTrees; data.Data = permissionTrees;
data.msg = "获取成功"; data.Message = "获取成功";
} }
} }
} }
@ -572,12 +572,12 @@ namespace Tiobon.Core.Controllers
var data = new ServiceResult<string>(); var data = new ServiceResult<string>();
if (permission != null && permission.Id > 0) 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); await _roleModulePermissionServices.UpdateModuleId(permission.Id, permission.Mid);
if (data.success) if (data.Success)
{ {
data.msg = "更新成功"; data.Message = "更新成功";
data.response = permission?.Id.ObjToString(); data.Data = permission?.Id.ObjToString();
} }
} }
@ -598,11 +598,11 @@ namespace Tiobon.Core.Controllers
{ {
var userDetail = await _permissionServices.QueryById(id); var userDetail = await _permissionServices.QueryById(id);
userDetail.IsDeleted = true; userDetail.IsDeleted = true;
data.success = await _permissionServices.Update(userDetail); data.Success = await _permissionServices.Update(userDetail);
if (data.success) if (data.Success)
{ {
data.msg = "删除成功"; data.Message = "删除成功";
data.response = userDetail?.Id.ObjToString(); data.Data = userDetail?.Id.ObjToString();
} }
} }
@ -634,11 +634,11 @@ namespace Tiobon.Core.Controllers
} }
} }
data.success = ids.IsNotEmptyOrNull(); data.Success = ids.IsNotEmptyOrNull();
if (data.success) if (data.Success)
{ {
data.response = ids; data.Data = ids;
data.msg = $"{sucCount}条数据添加成功"; data.Message = $"{sucCount}条数据添加成功";
} }
return data; return data;
@ -654,7 +654,7 @@ namespace Tiobon.Core.Controllers
var data = new ServiceResult<List<Permission>>(); var data = new ServiceResult<List<Permission>>();
if (controllerName.IsNullOrEmpty()) if (controllerName.IsNullOrEmpty())
{ {
data.msg = "必须填写要迁移的所属接口的控制器名称"; data.Message = "必须填写要迁移的所属接口的控制器名称";
return data; return data;
} }
@ -669,7 +669,7 @@ namespace Tiobon.Core.Controllers
var url = $"{Configuration}/swagger/V2/swagger.json"; var url = $"{Configuration}/swagger/V2/swagger.json";
if (Configuration.IsNullOrEmpty()) if (Configuration.IsNullOrEmpty())
{ {
data.msg = "Swagger.json在线文件域名不能为空"; data.Message = "Swagger.json在线文件域名不能为空";
return data; return data;
} }
if (token.IsNullOrEmpty()) token = Request.Headers.Authorization; if (token.IsNullOrEmpty()) token = Request.Headers.Authorization;
@ -763,12 +763,12 @@ namespace Tiobon.Core.Controllers
} }
} }
data.msg = "同步完成"; data.Message = "同步完成";
} }
data.response = permissions; data.Data = permissions;
data.status = 200; data.Status = 200;
data.success = isAction; data.Success = isAction;
return data; return data;
} }

40
Tiobon.Core.Api/Controllers/SplitDemoController.cs
Unescape View File

@ -35,7 +35,7 @@
} }
Expression<Func<SplitDemo, bool>> whereExpression = a => (a.Name != null && a.Name.Contains(key)); 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 "); var data = await splitDemoServices.QueryPageSplit(whereExpression, beginTime, endTime, page, pageSize, " Id desc ");
return ServiceResult<PageModel<SplitDemo>>.Message(data.dataCount >= 0, "获取成功", data); return ServiceResult<PageModel<SplitDemo>>.OprateSuccess(data.dataCount >= 0, "获取成功", data);
} }
/// <summary> /// <summary>
@ -71,17 +71,17 @@
var data = new ServiceResult<string>(); var data = new ServiceResult<string>();
//unitOfWorkManage.BeginTran(); //unitOfWorkManage.BeginTran();
var id = (await splitDemoServices.AddSplit(splitDemo)); var id = (await splitDemoServices.AddSplit(splitDemo));
data.success = (id == null ? false : true); data.Success = (id == null ? false : true);
try try
{ {
if (data.success) if (data.Success)
{ {
data.response = id.FirstOrDefault().ToString(); data.Data = id.FirstOrDefault().ToString();
data.msg = "添加成功"; data.Message = "添加成功";
} }
else else
{ {
data.msg = "添加失败"; data.Message = "添加失败";
} }
} }
catch (Exception) catch (Exception)
@ -90,7 +90,7 @@
} }
finally finally
{ {
//if (data.success) //if (data.Success)
// unitOfWorkManage.CommitTran(); // unitOfWorkManage.CommitTran();
//else //else
// unitOfWorkManage.RollbackTran(); // unitOfWorkManage.RollbackTran();
@ -111,17 +111,17 @@
if (splitDemo != null && splitDemo.Id > 0) if (splitDemo != null && splitDemo.Id > 0)
{ {
unitOfWorkManage.BeginTran(); unitOfWorkManage.BeginTran();
data.success = await splitDemoServices.UpdateSplit(splitDemo, splitDemo.CreateTime); data.Success = await splitDemoServices.UpdateSplit(splitDemo, splitDemo.CreateTime);
try try
{ {
if (data.success) if (data.Success)
{ {
data.msg = "修改成功"; data.Message = "修改成功";
data.response = splitDemo?.Id.ObjToString(); data.Data = splitDemo?.Id.ObjToString();
} }
else else
{ {
data.msg = "修改失败"; data.Message = "修改失败";
} }
} }
catch (Exception) catch (Exception)
@ -130,7 +130,7 @@
} }
finally finally
{ {
if (data.success) if (data.Success)
unitOfWorkManage.CommitTran(); unitOfWorkManage.CommitTran();
else else
unitOfWorkManage.RollbackTran(); unitOfWorkManage.RollbackTran();
@ -154,17 +154,17 @@
if (model != null) if (model != null)
{ {
unitOfWorkManage.BeginTran(); unitOfWorkManage.BeginTran();
data.success = await splitDemoServices.DeleteSplit(model,model.CreateTime); data.Success = await splitDemoServices.DeleteSplit(model,model.CreateTime);
try try
{ {
data.response = id.ObjToString(); data.Data = id.ObjToString();
if (data.success) if (data.Success)
{ {
data.msg = "删除成功"; data.Message = "删除成功";
} }
else else
{ {
data.msg = "删除失败"; data.Message = "删除失败";
} }
} }
@ -174,7 +174,7 @@
} }
finally finally
{ {
if (data.success) if (data.Success)
unitOfWorkManage.CommitTran(); unitOfWorkManage.CommitTran();
else else
unitOfWorkManage.RollbackTran(); unitOfWorkManage.RollbackTran();
@ -182,7 +182,7 @@
} }
else else
{ {
data.msg = "不存在"; data.Message = "不存在";
} }
return data; return data;

174
Tiobon.Core.Api/Controllers/TasksQzController.cs
Unescape View File

@ -48,7 +48,7 @@ namespace Tiobon.Core.Controllers
item.Triggers = await _schedulerCenter.GetTaskStaus(item); item.Triggers = await _schedulerCenter.GetTaskStaus(item);
} }
} }
return ServiceResult<PageModel<TasksQz>>.Message(data.dataCount >= 0, "获取成功", data); return ServiceResult<PageModel<TasksQz>>.OprateSuccess(data.dataCount >= 0, "获取成功", data);
} }
/// <summary> /// <summary>
@ -62,32 +62,32 @@ namespace Tiobon.Core.Controllers
var data = new ServiceResult<string>(); var data = new ServiceResult<string>();
_unitOfWorkManage.BeginTran(); _unitOfWorkManage.BeginTran();
var id = (await _tasksQzServices.Add(tasksQz)); var id = (await _tasksQzServices.Add(tasksQz));
data.success = id > 0; data.Success = id > 0;
try try
{ {
if (data.success) if (data.Success)
{ {
tasksQz.Id = id; tasksQz.Id = id;
data.response = id.ObjToString(); data.Data = id.ObjToString();
data.msg = "添加成功"; data.Message = "添加成功";
if (tasksQz.IsStart) if (tasksQz.IsStart)
{ {
//如果是启动自动 //如果是启动自动
var ResuleModel = await _schedulerCenter.AddScheduleJobAsync(tasksQz); var ResuleModel = await _schedulerCenter.AddScheduleJobAsync(tasksQz);
data.success = ResuleModel.success; data.Success = ResuleModel.Success;
if (ResuleModel.success) if (ResuleModel.Success)
{ {
data.msg = $"{data.msg}=>启动成功=>{ResuleModel.msg}"; data.Message = $"{data.Message}=>启动成功=>{ResuleModel.Message}";
} }
else else
{ {
data.msg = $"{data.msg}=>启动失败=>{ResuleModel.msg}"; data.Message = $"{data.Message}=>启动失败=>{ResuleModel.Message}";
} }
} }
} }
else else
{ {
data.msg = "添加失败"; data.Message = "添加失败";
} }
} }
@ -97,7 +97,7 @@ namespace Tiobon.Core.Controllers
} }
finally finally
{ {
if (data.success) if (data.Success)
_unitOfWorkManage.CommitTran(); _unitOfWorkManage.CommitTran();
else else
_unitOfWorkManage.RollbackTran(); _unitOfWorkManage.RollbackTran();
@ -118,30 +118,30 @@ namespace Tiobon.Core.Controllers
if (tasksQz != null && tasksQz.Id > 0) if (tasksQz != null && tasksQz.Id > 0)
{ {
_unitOfWorkManage.BeginTran(); _unitOfWorkManage.BeginTran();
data.success = await _tasksQzServices.Update(tasksQz); data.Success = await _tasksQzServices.Update(tasksQz);
try try
{ {
if (data.success) if (data.Success)
{ {
data.msg = "修改成功"; data.Message = "修改成功";
data.response = tasksQz?.Id.ObjToString(); data.Data = tasksQz?.Id.ObjToString();
if (tasksQz.IsStart) if (tasksQz.IsStart)
{ {
var ResuleModelStop = await _schedulerCenter.StopScheduleJobAsync(tasksQz); var ResuleModelStop = await _schedulerCenter.StopScheduleJobAsync(tasksQz);
data.msg = $"{data.msg}=>停止:{ResuleModelStop.msg}"; data.Message = $"{data.Message}=>停止:{ResuleModelStop.Message}";
var ResuleModelStar = await _schedulerCenter.AddScheduleJobAsync(tasksQz); var ResuleModelStar = await _schedulerCenter.AddScheduleJobAsync(tasksQz);
data.success = ResuleModelStar.success; data.Success = ResuleModelStar.Success;
data.msg = $"{data.msg}=>启动:{ResuleModelStar.msg}"; data.Message = $"{data.Message}=>启动:{ResuleModelStar.Message}";
} }
else else
{ {
var ResuleModelStop = await _schedulerCenter.StopScheduleJobAsync(tasksQz); var ResuleModelStop = await _schedulerCenter.StopScheduleJobAsync(tasksQz);
data.msg = $"{data.msg}=>停止:{ResuleModelStop.msg}"; data.Message = $"{data.Message}=>停止:{ResuleModelStop.Message}";
} }
} }
else else
{ {
data.msg = "修改失败"; data.Message = "修改失败";
} }
} }
catch (Exception) catch (Exception)
@ -150,7 +150,7 @@ namespace Tiobon.Core.Controllers
} }
finally finally
{ {
if (data.success) if (data.Success)
_unitOfWorkManage.CommitTran(); _unitOfWorkManage.CommitTran();
else else
_unitOfWorkManage.RollbackTran(); _unitOfWorkManage.RollbackTran();
@ -172,19 +172,19 @@ namespace Tiobon.Core.Controllers
if (model != null) if (model != null)
{ {
_unitOfWorkManage.BeginTran(); _unitOfWorkManage.BeginTran();
data.success = await _tasksQzServices.Delete(model); data.Success = await _tasksQzServices.Delete(model);
try try
{ {
data.response = jobId.ObjToString(); data.Data = jobId.ObjToString();
if (data.success) if (data.Success)
{ {
data.msg = "删除成功"; data.Message = "删除成功";
var ResuleModel = await _schedulerCenter.StopScheduleJobAsync(model); var ResuleModel = await _schedulerCenter.StopScheduleJobAsync(model);
data.msg = $"{data.msg}=>任务状态=>{ResuleModel.msg}"; data.Message = $"{data.Message}=>任务状态=>{ResuleModel.Message}";
} }
else else
{ {
data.msg = "删除失败"; data.Message = "删除失败";
} }
} }
@ -194,7 +194,7 @@ namespace Tiobon.Core.Controllers
} }
finally finally
{ {
if (data.success) if (data.Success)
_unitOfWorkManage.CommitTran(); _unitOfWorkManage.CommitTran();
else else
_unitOfWorkManage.RollbackTran(); _unitOfWorkManage.RollbackTran();
@ -202,7 +202,7 @@ namespace Tiobon.Core.Controllers
} }
else else
{ {
data.msg = "任务不存在"; data.Message = "任务不存在";
} }
return data; return data;
@ -224,26 +224,26 @@ namespace Tiobon.Core.Controllers
try try
{ {
model.IsStart = true; model.IsStart = true;
data.success = await _tasksQzServices.Update(model); data.Success = await _tasksQzServices.Update(model);
data.response = jobId.ObjToString(); data.Data = jobId.ObjToString();
if (data.success) if (data.Success)
{ {
data.msg = "更新成功"; data.Message = "更新成功";
var ResuleModel = await _schedulerCenter.AddScheduleJobAsync(model); var ResuleModel = await _schedulerCenter.AddScheduleJobAsync(model);
data.success = ResuleModel.success; data.Success = ResuleModel.Success;
if (ResuleModel.success) if (ResuleModel.Success)
{ {
data.msg = $"{data.msg}=>启动成功=>{ResuleModel.msg}"; data.Message = $"{data.Message}=>启动成功=>{ResuleModel.Message}";
} }
else else
{ {
data.msg = $"{data.msg}=>启动失败=>{ResuleModel.msg}"; data.Message = $"{data.Message}=>启动失败=>{ResuleModel.Message}";
} }
} }
else else
{ {
data.msg = "更新失败"; data.Message = "更新失败";
} }
} }
catch (Exception) catch (Exception)
@ -252,7 +252,7 @@ namespace Tiobon.Core.Controllers
} }
finally finally
{ {
if (data.success) if (data.Success)
_unitOfWorkManage.CommitTran(); _unitOfWorkManage.CommitTran();
else else
_unitOfWorkManage.RollbackTran(); _unitOfWorkManage.RollbackTran();
@ -260,7 +260,7 @@ namespace Tiobon.Core.Controllers
} }
else else
{ {
data.msg = "任务不存在"; data.Message = "任务不存在";
} }
return data; return data;
} }
@ -278,29 +278,29 @@ namespace Tiobon.Core.Controllers
if (model != null) if (model != null)
{ {
model.IsStart = false; model.IsStart = false;
data.success = await _tasksQzServices.Update(model); data.Success = await _tasksQzServices.Update(model);
data.response = jobId.ObjToString(); data.Data = jobId.ObjToString();
if (data.success) if (data.Success)
{ {
data.msg = "更新成功"; data.Message = "更新成功";
var ResuleModel = await _schedulerCenter.StopScheduleJobAsync(model); 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 else
{ {
data.msg = $"{data.msg}=>停止失败=>{ResuleModel.msg}"; data.Message = $"{data.Message}=>停止失败=>{ResuleModel.Message}";
} }
} }
else else
{ {
data.msg = "更新失败"; data.Message = "更新失败";
} }
} }
else else
{ {
data.msg = "任务不存在"; data.Message = "任务不存在";
} }
return data; return data;
} }
@ -319,25 +319,25 @@ namespace Tiobon.Core.Controllers
_unitOfWorkManage.BeginTran(); _unitOfWorkManage.BeginTran();
try try
{ {
data.success = await _tasksQzServices.Update(model); data.Success = await _tasksQzServices.Update(model);
data.response = jobId.ObjToString(); data.Data = jobId.ObjToString();
if (data.success) if (data.Success)
{ {
data.msg = "更新成功"; data.Message = "更新成功";
var ResuleModel = await _schedulerCenter.PauseJob(model); 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 else
{ {
data.msg = $"{data.msg}=>暂停失败=>{ResuleModel.msg}"; data.Message = $"{data.Message}=>暂停失败=>{ResuleModel.Message}";
} }
data.success = ResuleModel.success; data.Success = ResuleModel.Success;
} }
else else
{ {
data.msg = "更新失败"; data.Message = "更新失败";
} }
} }
catch (Exception) catch (Exception)
@ -346,7 +346,7 @@ namespace Tiobon.Core.Controllers
} }
finally finally
{ {
if (data.success) if (data.Success)
_unitOfWorkManage.CommitTran(); _unitOfWorkManage.CommitTran();
else else
_unitOfWorkManage.RollbackTran(); _unitOfWorkManage.RollbackTran();
@ -354,7 +354,7 @@ namespace Tiobon.Core.Controllers
} }
else else
{ {
data.msg = "任务不存在"; data.Message = "任务不存在";
} }
return data; return data;
} }
@ -375,25 +375,25 @@ namespace Tiobon.Core.Controllers
try try
{ {
model.IsStart = true; model.IsStart = true;
data.success = await _tasksQzServices.Update(model); data.Success = await _tasksQzServices.Update(model);
data.response = jobId.ObjToString(); data.Data = jobId.ObjToString();
if (data.success) if (data.Success)
{ {
data.msg = "更新成功"; data.Message = "更新成功";
var ResuleModel = await _schedulerCenter.ResumeJob(model); 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 else
{ {
data.msg = $"{data.msg}=>恢复失败=>{ResuleModel.msg}"; data.Message = $"{data.Message}=>恢复失败=>{ResuleModel.Message}";
} }
data.success = ResuleModel.success; data.Success = ResuleModel.Success;
} }
else else
{ {
data.msg = "更新失败"; data.Message = "更新失败";
} }
} }
catch (Exception) catch (Exception)
@ -402,7 +402,7 @@ namespace Tiobon.Core.Controllers
} }
finally finally
{ {
if (data.success) if (data.Success)
_unitOfWorkManage.CommitTran(); _unitOfWorkManage.CommitTran();
else else
_unitOfWorkManage.RollbackTran(); _unitOfWorkManage.RollbackTran();
@ -410,7 +410,7 @@ namespace Tiobon.Core.Controllers
} }
else else
{ {
data.msg = "任务不存在"; data.Message = "任务不存在";
} }
return data; return data;
} }
@ -431,29 +431,29 @@ namespace Tiobon.Core.Controllers
try try
{ {
model.IsStart = true; model.IsStart = true;
data.success = await _tasksQzServices.Update(model); data.Success = await _tasksQzServices.Update(model);
data.response = jobId.ObjToString(); data.Data = jobId.ObjToString();
if (data.success) if (data.Success)
{ {
data.msg = "更新成功"; data.Message = "更新成功";
var ResuleModelStop = await _schedulerCenter.StopScheduleJobAsync(model); var ResuleModelStop = await _schedulerCenter.StopScheduleJobAsync(model);
var ResuleModelStar = await _schedulerCenter.AddScheduleJobAsync(model); var ResuleModelStar = await _schedulerCenter.AddScheduleJobAsync(model);
if (ResuleModelStar.success) if (ResuleModelStar.Success)
{ {
data.msg = $"{data.msg}=>停止:{ResuleModelStop.msg}=>启动:{ResuleModelStar.msg}"; data.Message = $"{data.Message}=>停止:{ResuleModelStop.Message}=>启动:{ResuleModelStar.Message}";
data.response = jobId.ObjToString(); data.Data = jobId.ObjToString();
} }
else else
{ {
data.msg = $"{data.msg}=>停止:{ResuleModelStop.msg}=>启动:{ResuleModelStar.msg}"; data.Message = $"{data.Message}=>停止:{ResuleModelStop.Message}=>启动:{ResuleModelStar.Message}";
data.response = jobId.ObjToString(); data.Data = jobId.ObjToString();
} }
data.success = ResuleModelStar.success; data.Success = ResuleModelStar.Success;
} }
else else
{ {
data.msg = "更新失败"; data.Message = "更新失败";
} }
} }
catch (Exception) catch (Exception)
@ -462,7 +462,7 @@ namespace Tiobon.Core.Controllers
} }
finally finally
{ {
if (data.success) if (data.Success)
_unitOfWorkManage.CommitTran(); _unitOfWorkManage.CommitTran();
else else
_unitOfWorkManage.RollbackTran(); _unitOfWorkManage.RollbackTran();
@ -470,7 +470,7 @@ namespace Tiobon.Core.Controllers
} }
else else
{ {
data.msg = "任务不存在"; data.Message = "任务不存在";
} }
return data; return data;
@ -510,7 +510,7 @@ namespace Tiobon.Core.Controllers
} }
else else
{ {
data.msg = "任务不存在"; data.Message = "任务不存在";
} }
return data; return data;
} }
@ -522,7 +522,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<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); var model = await _tasksLogServices.GetTaskLogs(jobId, page, pageSize, runTimeStart, runTimeEnd);
return ServiceResult<PageModel<TasksLog>>.Message(model.dataCount >= 0, "获取成功", model); return ServiceResult<PageModel<TasksLog>>.OprateSuccess(model.dataCount >= 0, "获取成功", model);
} }
/// <summary> /// <summary>
/// 任务概况 /// 任务概况
@ -532,7 +532,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<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); var model = await _tasksLogServices.GetTaskOverview(jobId, runTimeStart, runTimeEnd, type);
return ServiceResult<object>.Message(true, "获取成功", model); return ServiceResult<object>.OprateSuccess(true, "获取成功", model);
} }
} }

8
Tiobon.Core.Api/Controllers/TopicController.cs
Unescape View File

@ -27,11 +27,11 @@
[HttpGet] [HttpGet]
public async Task<ServiceResult<List<Topic>>> Get() public async Task<ServiceResult<List<Topic>>> Get()
{ {
var data = new ServiceResult<List<Topic>> {response = await _topicServices.GetTopics()}; var data = new ServiceResult<List<Topic>> { Data = await _topicServices.GetTopics() };
if (data.response != null) if (data.Data != null)
{ {
data.success = true; data.Success = true;
data.msg = ""; data.Message = "";
} }
return data; return data;
} }

38
Tiobon.Core.Api/Controllers/TopicDetailController.cs
Unescape View File

@ -59,9 +59,9 @@
return new ServiceResult<PageModel<TopicDetail>>() return new ServiceResult<PageModel<TopicDetail>>()
{ {
msg = "获取成功", Message = "获取成功",
success = data.dataCount >= 0, Success = data.dataCount >= 0,
response = data Data = data
}; };
} }
@ -78,11 +78,11 @@
{ {
var data = new ServiceResult<TopicDetail>(); var data = new ServiceResult<TopicDetail>();
var response = id > 0 ? await _topicDetailServices.QueryById(id) : new TopicDetail(); var response = id > 0 ? await _topicDetailServices.QueryById(id) : new TopicDetail();
data.response = (response?.tdIsDelete).ObjToBool() ? new TopicDetail() : response; data.Data = (response?.tdIsDelete).ObjToBool() ? new TopicDetail() : response;
if (data.response != null) if (data.Data != null)
{ {
data.success = true; data.Success = true;
data.msg = ""; data.Message = "";
} }
return data; return data;
@ -107,11 +107,11 @@
topicDetail.tdTop = 0; topicDetail.tdTop = 0;
var id = (await _topicDetailServices.Add(topicDetail)); var id = (await _topicDetailServices.Add(topicDetail));
data.success = id > 0; data.Success = id > 0;
if (data.success) if (data.Success)
{ {
data.response = id.ObjToString(); data.Data = id.ObjToString();
data.msg = "添加成功"; data.Message = "添加成功";
} }
return data; return data;
@ -129,11 +129,11 @@
var data = new ServiceResult<string>(); var data = new ServiceResult<string>();
if (topicDetail != null && topicDetail.Id > 0) if (topicDetail != null && topicDetail.Id > 0)
{ {
data.success = await _topicDetailServices.Update(topicDetail); data.Success = await _topicDetailServices.Update(topicDetail);
if (data.success) if (data.Success)
{ {
data.msg = "更新成功"; data.Message = "更新成功";
data.response = topicDetail?.Id.ObjToString(); data.Data = topicDetail?.Id.ObjToString();
} }
} }
@ -154,11 +154,11 @@
{ {
var topicDetail = await _topicDetailServices.QueryById(id); var topicDetail = await _topicDetailServices.QueryById(id);
topicDetail.tdIsDelete = true; topicDetail.tdIsDelete = true;
data.success = await _topicDetailServices.Update(topicDetail); data.Success = await _topicDetailServices.Update(topicDetail);
if (data.success) if (data.Success)
{ {
data.msg = "删除成功"; data.Message = "删除成功";
data.response = topicDetail?.Id.ObjToString(); data.Data = topicDetail?.Id.ObjToString();
} }
} }

6
Tiobon.Core.Api/Controllers/TransactionController.cs
Unescape View File

@ -80,9 +80,9 @@
return new ServiceResult<IEnumerable<string>>() return new ServiceResult<IEnumerable<string>>()
{ {
success = true, Success = true,
msg = "操作完成", Message = "操作完成",
response = returnMsg Data = returnMsg
}; };
} }

30
Tiobon.Core.Api/Controllers/UserController.cs
Unescape View File

@ -138,9 +138,9 @@ namespace Tiobon.Core.Controllers
var userinfo = await _sysUserInfoServices.QueryById(tokenModel.Uid); var userinfo = await _sysUserInfoServices.QueryById(tokenModel.Uid);
if (userinfo != null) if (userinfo != null)
{ {
data.response = _mapper.Map<SysUserInfoDto>(userinfo); data.Data = _mapper.Map<SysUserInfoDto>(userinfo);
data.success = true; data.Success = true;
data.msg = "获取成功"; data.Message = "获取成功";
} }
} }
} }
@ -163,11 +163,11 @@ namespace Tiobon.Core.Controllers
sysUserInfo.uRemark = _user.Name; sysUserInfo.uRemark = _user.Name;
var id = await _sysUserInfoServices.Add(_mapper.Map<SysUserInfo>(sysUserInfo)); var id = await _sysUserInfoServices.Add(_mapper.Map<SysUserInfo>(sysUserInfo));
data.success = id > 0; data.Success = id > 0;
if (data.success) if (data.Success)
{ {
data.response = id.ObjToString(); data.Data = id.ObjToString();
data.msg = "添加成功"; data.Message = "添加成功";
} }
return data; return data;
@ -229,14 +229,14 @@ namespace Tiobon.Core.Controllers
await _userRoleServices.Add(userRolsAdd); await _userRoleServices.Add(userRolsAdd);
} }
data.success = await _sysUserInfoServices.Update(oldUser); data.Success = await _sysUserInfoServices.Update(oldUser);
_unitOfWorkManage.CommitTran(); _unitOfWorkManage.CommitTran();
if (data.success) if (data.Success)
{ {
data.msg = "更新成功"; data.Message = "更新成功";
data.response = oldUser.Id.ObjToString(); data.Data = oldUser.Id.ObjToString();
} }
} }
catch (Exception e) catch (Exception e)
@ -262,11 +262,11 @@ namespace Tiobon.Core.Controllers
{ {
var userDetail = await _sysUserInfoServices.QueryById(id); var userDetail = await _sysUserInfoServices.QueryById(id);
userDetail.IsDeleted = true; userDetail.IsDeleted = true;
data.success = await _sysUserInfoServices.Update(userDetail); data.Success = await _sysUserInfoServices.Update(userDetail);
if (data.success) if (data.Success)
{ {
data.msg = "删除成功"; data.Message = "删除成功";
data.response = userDetail?.Id.ObjToString(); data.Data = userDetail?.Id.ObjToString();
} }
} }

18
Tiobon.Core.Api/Controllers/UserRoleController.cs
Unescape View File

@ -43,9 +43,9 @@
var userInfo = await _sysUserInfoServices.SaveUserInfo(loginName, loginPwd); var userInfo = await _sysUserInfoServices.SaveUserInfo(loginName, loginPwd);
return new ServiceResult<SysUserInfoDto>() return new ServiceResult<SysUserInfoDto>()
{ {
success = true, Success = true,
msg = "添加成功", Message = "添加成功",
response = _mapper.Map<SysUserInfoDto>(userInfo) Data = _mapper.Map<SysUserInfoDto>(userInfo)
}; };
} }
@ -59,9 +59,9 @@
{ {
return new ServiceResult<Role>() return new ServiceResult<Role>()
{ {
success = true, Success = true,
msg = "添加成功", Message = "添加成功",
response = await _roleServices.SaveRole(roleName) Data = await _roleServices.SaveRole(roleName)
}; };
} }
@ -76,9 +76,9 @@
{ {
return new ServiceResult<UserRole>() return new ServiceResult<UserRole>()
{ {
success = true, Success = true,
msg = "添加成功", Message = "添加成功",
response = await _userRoleServices.SaveUserRole(uid, rid) Data = await _userRoleServices.SaveUserRole(uid, rid)
}; };
} }

10
Tiobon.Core.Api/Controllers/ValuesController.cs
Unescape View File

@ -117,8 +117,8 @@ namespace Tiobon.Core.Controllers
{ {
return new ServiceResult<List<ClaimDto>>() return new ServiceResult<List<ClaimDto>>()
{ {
success = true, Success = true,
response = (_user.GetClaimsIdentity().ToList()).Select(d => Data = (_user.GetClaimsIdentity().ToList()).Select(d =>
new ClaimDto new ClaimDto
{ {
Type = d.Type, Type = d.Type,
@ -291,9 +291,9 @@ namespace Tiobon.Core.Controllers
var getUserInfoByToken = _user.GetUserInfoFromToken(ClaimType); var getUserInfoByToken = _user.GetUserInfoFromToken(ClaimType);
return new ServiceResult<List<string>>() return new ServiceResult<List<string>>()
{ {
success = _user.IsAuthenticated(), Success = _user.IsAuthenticated(),
msg = _user.IsAuthenticated() ? _user.Name.ObjToString() : "未登录", Message = _user.IsAuthenticated() ? _user.Name.ObjToString() : "未登录",
response = _user.GetClaimValueByType(ClaimType) Data = _user.GetClaimValueByType(ClaimType)
}; };
} }

12
Tiobon.Core.Api/Controllers/WeChatCompanyController.cs
Unescape View File

@ -26,7 +26,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<PageModel<WeChatCompany>>> Get([FromQuery] PaginationModel pagination) public async Task<ServiceResult<PageModel<WeChatCompany>>> Get([FromQuery] PaginationModel pagination)
{ {
var data = await _WeChatCompanyServices.QueryPage(pagination); var data = await _WeChatCompanyServices.QueryPage(pagination);
return new ServiceResult<PageModel<WeChatCompany>> { success = true, response = data}; return new ServiceResult<PageModel<WeChatCompany>> { Success = true, Data = data };
} }
/// <summary> /// <summary>
/// 获取(id) /// 获取(id)
@ -37,7 +37,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<WeChatCompany>> Get(string id) public async Task<ServiceResult<WeChatCompany>> Get(string id)
{ {
var data = await _WeChatCompanyServices.QueryById(id); var data = await _WeChatCompanyServices.QueryById(id);
return new ServiceResult<WeChatCompany> { success = true, response = data }; return new ServiceResult<WeChatCompany> { Success = true, Data = data };
} }
/// <summary> /// <summary>
/// 添加 /// 添加
@ -47,7 +47,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<string>> Post([FromBody] WeChatCompany obj) public async Task<ServiceResult<string>> Post([FromBody] WeChatCompany obj)
{ {
await _WeChatCompanyServices.Add(obj); await _WeChatCompanyServices.Add(obj);
return new ServiceResult<string> { success = true}; return new ServiceResult<string> { Success = true };
} }
/// <summary> /// <summary>
/// 更新 /// 更新
@ -57,7 +57,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<string>> Put([FromBody] WeChatCompany obj) public async Task<ServiceResult<string>> Put([FromBody] WeChatCompany obj)
{ {
await _WeChatCompanyServices.Update(obj); await _WeChatCompanyServices.Update(obj);
return new ServiceResult<string> { success = true}; return new ServiceResult<string> { Success = true };
} }
/// <summary> /// <summary>
/// 删除 /// 删除
@ -67,7 +67,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<string>> Delete(string id) public async Task<ServiceResult<string>> Delete(string id)
{ {
await _WeChatCompanyServices.DeleteById(id); await _WeChatCompanyServices.DeleteById(id);
return new ServiceResult<string> { success = true}; return new ServiceResult<string> { Success = true };
} }
/// <summary> /// <summary>
/// 批量删除 /// 批量删除
@ -78,7 +78,7 @@ namespace Tiobon.Core.Controllers
{ {
var i = ids.Split(","); var i = ids.Split(",");
await _WeChatCompanyServices.DeleteByIds(i); await _WeChatCompanyServices.DeleteByIds(i);
return new ServiceResult<string> { success = true }; return new ServiceResult<string> { Success = true };
} }
} }

12
Tiobon.Core.Api/Controllers/WeChatConfigController.cs
Unescape View File

@ -26,7 +26,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<PageModel<WeChatConfig>>> Get([FromQuery] PaginationModel pagination) public async Task<ServiceResult<PageModel<WeChatConfig>>> Get([FromQuery] PaginationModel pagination)
{ {
var data = await _WeChatConfigServices.QueryPage(pagination); var data = await _WeChatConfigServices.QueryPage(pagination);
return new ServiceResult<PageModel<WeChatConfig>> { success = true, response = data}; return new ServiceResult<PageModel<WeChatConfig>> { Success = true, Data = data };
} }
/// <summary> /// <summary>
/// 获取(id) /// 获取(id)
@ -37,7 +37,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<WeChatConfig>> Get(string id) public async Task<ServiceResult<WeChatConfig>> Get(string id)
{ {
var data = await _WeChatConfigServices.QueryById(id); var data = await _WeChatConfigServices.QueryById(id);
return new ServiceResult<WeChatConfig> { success = true, response = data }; return new ServiceResult<WeChatConfig> { Success = true, Data = data };
} }
/// <summary> /// <summary>
/// 添加 /// 添加
@ -47,7 +47,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<string>> Post([FromBody] WeChatConfig obj) public async Task<ServiceResult<string>> Post([FromBody] WeChatConfig obj)
{ {
await _WeChatConfigServices.Add(obj); await _WeChatConfigServices.Add(obj);
return new ServiceResult<string> { success = true}; return new ServiceResult<string> { Success = true };
} }
/// <summary> /// <summary>
/// 更新 /// 更新
@ -57,7 +57,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<string>> Put([FromBody] WeChatConfig obj) public async Task<ServiceResult<string>> Put([FromBody] WeChatConfig obj)
{ {
await _WeChatConfigServices.Update(obj); await _WeChatConfigServices.Update(obj);
return new ServiceResult<string> { success = true}; return new ServiceResult<string> { Success = true };
} }
/// <summary> /// <summary>
/// 删除 /// 删除
@ -67,7 +67,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<string>> Delete(string id) public async Task<ServiceResult<string>> Delete(string id)
{ {
await _WeChatConfigServices.DeleteById(id); await _WeChatConfigServices.DeleteById(id);
return new ServiceResult<string> { success = true}; return new ServiceResult<string> { Success = true };
} }
/// <summary> /// <summary>
/// 批量删除 /// 批量删除
@ -78,7 +78,7 @@ namespace Tiobon.Core.Controllers
{ {
var i = ids.Split(","); var i = ids.Split(",");
await _WeChatConfigServices.DeleteByIds(i); await _WeChatConfigServices.DeleteByIds(i);
return new ServiceResult<string> { success = true }; return new ServiceResult<string> { Success = true };
} }
} }

12
Tiobon.Core.Api/Controllers/WeChatPushLogController.cs
Unescape View File

@ -26,7 +26,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<PageModel<WeChatPushLog>>> Get([FromQuery] PaginationModel pagination) public async Task<ServiceResult<PageModel<WeChatPushLog>>> Get([FromQuery] PaginationModel pagination)
{ {
var data = await _WeChatPushLogServices.QueryPage(pagination); var data = await _WeChatPushLogServices.QueryPage(pagination);
return new ServiceResult<PageModel<WeChatPushLog>> { success = true, response = data}; return new ServiceResult<PageModel<WeChatPushLog>> { Success = true, Data = data };
} }
/// <summary> /// <summary>
/// 获取(id) /// 获取(id)
@ -37,7 +37,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<WeChatPushLog>> Get(string id) public async Task<ServiceResult<WeChatPushLog>> Get(string id)
{ {
var data = await _WeChatPushLogServices.QueryById(id); var data = await _WeChatPushLogServices.QueryById(id);
return new ServiceResult<WeChatPushLog> { success = true, response = data }; return new ServiceResult<WeChatPushLog> { Success = true, Data = data };
} }
/// <summary> /// <summary>
/// 添加 /// 添加
@ -47,7 +47,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<string>> Post([FromBody] WeChatPushLog obj) public async Task<ServiceResult<string>> Post([FromBody] WeChatPushLog obj)
{ {
await _WeChatPushLogServices.Add(obj); await _WeChatPushLogServices.Add(obj);
return new ServiceResult<string> { success = true}; return new ServiceResult<string> { Success = true };
} }
/// <summary> /// <summary>
/// 更新 /// 更新
@ -57,7 +57,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<string>> Put([FromBody] WeChatPushLog obj) public async Task<ServiceResult<string>> Put([FromBody] WeChatPushLog obj)
{ {
await _WeChatPushLogServices.Update(obj); await _WeChatPushLogServices.Update(obj);
return new ServiceResult<string> { success = true}; return new ServiceResult<string> { Success = true };
} }
/// <summary> /// <summary>
/// 删除 /// 删除
@ -67,7 +67,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<string>> Delete(string id) public async Task<ServiceResult<string>> Delete(string id)
{ {
await _WeChatPushLogServices.DeleteById(id); await _WeChatPushLogServices.DeleteById(id);
return new ServiceResult<string> { success = true}; return new ServiceResult<string> { Success = true };
} }
/// <summary> /// <summary>
/// 批量删除 /// 批量删除
@ -78,7 +78,7 @@ namespace Tiobon.Core.Controllers
{ {
var i = ids.Split(","); var i = ids.Split(",");
await _WeChatPushLogServices.DeleteByIds(i); await _WeChatPushLogServices.DeleteByIds(i);
return new ServiceResult<string> { success = true }; return new ServiceResult<string> { Success = true };
} }
} }

12
Tiobon.Core.Api/Controllers/WeChatSubController.cs
Unescape View File

@ -26,7 +26,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<PageModel<WeChatSub>>> Get([FromQuery] PaginationModel pagination) public async Task<ServiceResult<PageModel<WeChatSub>>> Get([FromQuery] PaginationModel pagination)
{ {
var data = await _WeChatSubServices.QueryPage(pagination); var data = await _WeChatSubServices.QueryPage(pagination);
return new ServiceResult<PageModel<WeChatSub>> { success = true, response = data}; return new ServiceResult<PageModel<WeChatSub>> { Success = true, Data = data };
} }
/// <summary> /// <summary>
/// 获取(id) /// 获取(id)
@ -37,7 +37,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<WeChatSub>> Get(string id) public async Task<ServiceResult<WeChatSub>> Get(string id)
{ {
var data = await _WeChatSubServices.QueryById(id); var data = await _WeChatSubServices.QueryById(id);
return new ServiceResult<WeChatSub> { success = true, response = data }; return new ServiceResult<WeChatSub> { Success = true, Data = data };
} }
/// <summary> /// <summary>
/// 添加 /// 添加
@ -47,7 +47,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<string>> Post([FromBody] WeChatSub obj) public async Task<ServiceResult<string>> Post([FromBody] WeChatSub obj)
{ {
await _WeChatSubServices.Add(obj); await _WeChatSubServices.Add(obj);
return new ServiceResult<string> { success = true}; return new ServiceResult<string> { Success = true };
} }
/// <summary> /// <summary>
/// 更新 /// 更新
@ -57,7 +57,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<string>> Put([FromBody] WeChatSub obj) public async Task<ServiceResult<string>> Put([FromBody] WeChatSub obj)
{ {
await _WeChatSubServices.Update(obj); await _WeChatSubServices.Update(obj);
return new ServiceResult<string> { success = true}; return new ServiceResult<string> { Success = true };
} }
/// <summary> /// <summary>
/// 删除 /// 删除
@ -67,7 +67,7 @@ namespace Tiobon.Core.Controllers
public async Task<ServiceResult<string>> Delete(string id) public async Task<ServiceResult<string>> Delete(string id)
{ {
await _WeChatSubServices.DeleteById(id); await _WeChatSubServices.DeleteById(id);
return new ServiceResult<string> { success = true}; return new ServiceResult<string> { Success = true };
} }
/// <summary> /// <summary>
/// 批量删除 /// 批量删除
@ -78,7 +78,7 @@ namespace Tiobon.Core.Controllers
{ {
var i = ids.Split(","); var i = ids.Split(",");
await _WeChatSubServices.DeleteByIds(i); await _WeChatSubServices.DeleteByIds(i);
return new ServiceResult<string> { success = true }; return new ServiceResult<string> { Success = true };
} }
} }

14
Tiobon.Core.Api/Filter/GlobalExceptionFilter.cs
Unescape View File

@ -25,28 +25,28 @@ namespace Tiobon.Core.Filter
{ {
var json = new ServiceResult<string>(); var json = new ServiceResult<string>();
json.msg = context.Exception.Message;//错误信息 json.Message = context.Exception.Message;//错误信息
json.status = 500;//500异常 json.Status = 500;//500异常
var errorAudit = "Unable to resolve service for"; 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")) if (_env.EnvironmentName.ObjToString().Equals("Development"))
{ {
json.msgDev = context.Exception.StackTrace;//堆栈信息 json.MessageDev = context.Exception.StackTrace;//堆栈信息
} }
var res = new ContentResult(); var res = new ContentResult();
res.Content = JsonHelper.GetJSON<ServiceResult<string>>(json); res.Content = JsonHelper.GetJSON<ServiceResult<string>>(json);
context.Result = res; 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()) if (AppSettings.app(new string[] { "Middleware", "SignalRSendLog", "Enabled" }).ObjToBool())
{ {
_hubContext.Clients.All.SendAsync("ReceiveUpdate", LogLock.GetLogData()).Wait(); _hubContext.Clients.All.SendAsync("ReceiveUpdate", LogLock.GetLogData()).Wait();

36
Tiobon.Core.Api/Tiobon.Core.Model.xml
Unescape View File

@ -2128,27 +2128,27 @@
服务层响应实体(泛型) 服务层响应实体(泛型)
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.ServiceResult`1.status"> <member name="P:Tiobon.Core.Model.ServiceResult`1.Status">
<summary> <summary>
状态码 状态码
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.ServiceResult`1.success"> <member name="P:Tiobon.Core.Model.ServiceResult`1.Success">
<summary> <summary>
操作是否成功 操作是否成功
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.ServiceResult`1.msg"> <member name="P:Tiobon.Core.Model.ServiceResult`1.Message">
<summary> <summary>
返回信息 返回信息
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.ServiceResult`1.msgDev"> <member name="P:Tiobon.Core.Model.ServiceResult`1.MessageDev">
<summary> <summary>
开发者信息 开发者信息
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.ServiceResult`1.response"> <member name="P:Tiobon.Core.Model.ServiceResult`1.Data">
<summary> <summary>
返回数据集合 返回数据集合
</summary> </summary>
@ -2157,39 +2157,39 @@
<summary> <summary>
返回成功 返回成功
</summary> </summary>
<param name="msg">消息</param> <param name="message">消息</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Tiobon.Core.Model.ServiceResult`1.OprateSuccess(System.String,`0)"> <member name="M:Tiobon.Core.Model.ServiceResult`1.OprateSuccess(System.String,`0)">
<summary> <summary>
返回成功 返回成功
</summary> </summary>
<param name="msg">消息</param> <param name="message">消息</param>
<param name="response">数据</param> <param name="data">数据</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Tiobon.Core.Model.ServiceResult`1.OprateFailed(System.String)"> <member name="M:Tiobon.Core.Model.ServiceResult`1.OprateFailed(System.String)">
<summary> <summary>
返回失败 返回失败
</summary> </summary>
<param name="msg">消息</param> <param name="message">消息</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Tiobon.Core.Model.ServiceResult`1.OprateFailed(System.String,`0)"> <member name="M:Tiobon.Core.Model.ServiceResult`1.OprateFailed(System.String,`0)">
<summary> <summary>
返回失败 返回失败
</summary> </summary>
<param name="msg">消息</param> <param name="message">消息</param>
<param name="response">数据</param> <param name="data">数据</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Tiobon.Core.Model.ServiceResult`1.Message(System.Boolean,System.String,`0)"> <member name="M:Tiobon.Core.Model.ServiceResult`1.OprateSuccess(System.Boolean,System.String,`0)">
<summary> <summary>
返回消息 返回消息
</summary> </summary>
<param name="success">失败/成功</param> <param name="success">失败/成功</param>
<param name="msg">消息</param> <param name="message">消息</param>
<param name="response">数据</param> <param name="data">数据</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:Tiobon.Core.Model.ServiceResult"> <member name="T:Tiobon.Core.Model.ServiceResult">
@ -2197,22 +2197,22 @@
服务层响应实体 服务层响应实体
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.ServiceResult.status"> <member name="P:Tiobon.Core.Model.ServiceResult.Status">
<summary> <summary>
状态码 状态码
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.ServiceResult.success"> <member name="P:Tiobon.Core.Model.ServiceResult.Success">
<summary> <summary>
操作是否成功 操作是否成功
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.ServiceResult.msg"> <member name="P:Tiobon.Core.Model.ServiceResult.Message">
<summary> <summary>
返回信息 返回信息
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.ServiceResult.response"> <member name="P:Tiobon.Core.Model.ServiceResult.Data">
<summary> <summary>
返回数据集合 返回数据集合
</summary> </summary>

2
Tiobon.Core.Extensions/Authorizations/Policys/ApiResponseHandler.cs
Unescape View File

@ -37,7 +37,7 @@ namespace Tiobon.Core.AuthHelper
Response.ContentType = "application/json"; Response.ContentType = "application/json";
if (_user.MessageModel != null) if (_user.MessageModel != null)
{ {
Response.StatusCode = _user.MessageModel.status; Response.StatusCode = _user.MessageModel.Status;
await Response.WriteAsync(JsonConvert.SerializeObject(_user.MessageModel)); await Response.WriteAsync(JsonConvert.SerializeObject(_user.MessageModel));
} }
else else

8
Tiobon.Core.Extensions/Authorizations/Policys/PermissionHandler.cs
Unescape View File

@ -143,21 +143,21 @@ namespace Tiobon.Core.AuthHelper
if (user == null) if (user == null)
{ {
_user.MessageModel = new ApiResponse(StatusCode.CODE401, "用户不存在或已被删除").MessageModel; _user.MessageModel = new ApiResponse(StatusCode.CODE401, "用户不存在或已被删除").MessageModel;
context.Fail(new AuthorizationFailureReason(this, _user.MessageModel.msg)); context.Fail(new AuthorizationFailureReason(this, _user.MessageModel.Message));
return; return;
} }
if (user.IsDeleted) if (user.IsDeleted)
{ {
_user.MessageModel = new ApiResponse(StatusCode.CODE401, "用户已被删除,禁止登陆!").MessageModel; _user.MessageModel = new ApiResponse(StatusCode.CODE401, "用户已被删除,禁止登陆!").MessageModel;
context.Fail(new AuthorizationFailureReason(this, _user.MessageModel.msg)); context.Fail(new AuthorizationFailureReason(this, _user.MessageModel.Message));
return; return;
} }
if (!user.Enable) if (!user.Enable)
{ {
_user.MessageModel = new ApiResponse(StatusCode.CODE401, "用户已被禁用!禁止登陆!").MessageModel; _user.MessageModel = new ApiResponse(StatusCode.CODE401, "用户已被禁用!禁止登陆!").MessageModel;
context.Fail(new AuthorizationFailureReason(this, _user.MessageModel.msg)); context.Fail(new AuthorizationFailureReason(this, _user.MessageModel.Message));
return; return;
} }
} }
@ -200,7 +200,7 @@ namespace Tiobon.Core.AuthHelper
{ {
_user.MessageModel = new ApiResponse(StatusCode.CODE401, "很抱歉,授权已失效,请重新授权") _user.MessageModel = new ApiResponse(StatusCode.CODE401, "很抱歉,授权已失效,请重新授权")
.MessageModel; .MessageModel;
context.Fail(new AuthorizationFailureReason(this, _user.MessageModel.msg)); context.Fail(new AuthorizationFailureReason(this, _user.MessageModel.Message));
return; return;
} }
} }

4
Tiobon.Core.Extensions/HostedService/QuartzJobHostedService.cs
Unescape View File

@ -40,13 +40,13 @@ public class QuartzJobHostedService : IHostedService
if (item.IsStart) if (item.IsStart)
{ {
var result = await _schedulerCenter.AddScheduleJobAsync(item); var result = await _schedulerCenter.AddScheduleJobAsync(item);
if (result.success) if (result.Success)
{ {
Console.WriteLine($"QuartzNetJob{item.Name}启动成功！"); Console.WriteLine($"QuartzNetJob{item.Name}启动成功！");
} }
else else
{ {
Console.WriteLine($"QuartzNetJob{item.Name}启动失败！错误信息：{result.msg}"); Console.WriteLine($"QuartzNetJob{item.Name}启动失败！错误信息：{result.Message}");
} }
} }
} }

4
Tiobon.Core.Gateway/Controllers/UserController.cs
Unescape View File

@ -23,8 +23,8 @@ namespace Tiobon.Core.Gateway.Controllers
{ {
return new ServiceResult<List<ClaimDto>>() return new ServiceResult<List<ClaimDto>>()
{ {
success = true, Success = true,
response = (_user.GetClaimsIdentity().ToList()).Select(d => Data = (_user.GetClaimsIdentity().ToList()).Select(d =>
new ClaimDto new ClaimDto
{ {
Type = d.Type, Type = d.Type,

6
Tiobon.Core.Model/ApiResponse.cs
Unescape View File

@ -38,9 +38,9 @@
MessageModel = new ServiceResult<string>() MessageModel = new ServiceResult<string>()
{ {
status = Status, Status = Status,
msg = Value, Message = Value,
success = apiCode == StatusCode.CODE200 Success = apiCode == StatusCode.CODE200
}; };
} }
} }

66
Tiobon.Core.Model/ServiceResult.cs
Unescape View File

@ -10,73 +10,73 @@ public class ServiceResult<T>
/// <summary> /// <summary>
/// 状态码 /// 状态码
/// </summary> /// </summary>
public int status { get; set; } = 200; public int Status { get; set; } = 200;
/// <summary> /// <summary>
/// 操作是否成功 /// 操作是否成功
/// </summary> /// </summary>
public bool success { get; set; } = false; public bool Success { get; set; } = false;
/// <summary> /// <summary>
/// 返回信息 /// 返回信息
/// </summary> /// </summary>
public string msg { get; set; } = ""; public string Message { get; set; } = "";
/// <summary> /// <summary>
/// 开发者信息 /// 开发者信息
/// </summary> /// </summary>
public string msgDev { get; set; } public string MessageDev { get; set; }
/// <summary> /// <summary>
/// 返回数据集合 /// 返回数据集合
/// </summary> /// </summary>
public T response { get; set; } public T Data { get; set; }
/// <summary> /// <summary>
/// 返回成功 /// 返回成功
/// </summary> /// </summary>
/// <param name="msg">消息</param> /// <param name="message">消息</param>
/// <returns></returns> /// <returns></returns>
public static ServiceResult<T> OprateSuccess(string msg) public static ServiceResult<T> OprateSuccess(string message)
{ {
return Message(true, msg, default); return OprateSuccess(true, message, default);
} }
/// <summary> /// <summary>
/// 返回成功 /// 返回成功
/// </summary> /// </summary>
/// <param name="msg">消息</param> /// <param name="message">消息</param>
/// <param name="response">数据</param> /// <param name="data">数据</param>
/// <returns></returns> /// <returns></returns>
public static ServiceResult<T> OprateSuccess(string msg, T response) public static ServiceResult<T> OprateSuccess(string message, T data)
{ {
return Message(true, msg, response); return OprateSuccess(true, message, data);
} }
/// <summary> /// <summary>
/// 返回失败 /// 返回失败
/// </summary> /// </summary>
/// <param name="msg">消息</param> /// <param name="message">消息</param>
/// <returns></returns> /// <returns></returns>
public static ServiceResult<T> OprateFailed(string msg) public static ServiceResult<T> OprateFailed(string message)
{ {
return Message(false, msg, default); return OprateSuccess(false, message, default);
} }
/// <summary> /// <summary>
/// 返回失败 /// 返回失败
/// </summary> /// </summary>
/// <param name="msg">消息</param> /// <param name="message">消息</param>
/// <param name="response">数据</param> /// <param name="data">数据</param>
/// <returns></returns> /// <returns></returns>
public static ServiceResult<T> OprateFailed(string msg, T response) public static ServiceResult<T> OprateFailed(string message, T data)
{ {
return Message(false, msg, response); return OprateSuccess(false, message, data);
} }
/// <summary> /// <summary>
/// 返回消息 /// 返回消息
/// </summary> /// </summary>
/// <param name="success">失败/成功</param> /// <param name="success">失败/成功</param>
/// <param name="msg">消息</param> /// <param name="message">消息</param>
/// <param name="response">数据</param> /// <param name="data">数据</param>
/// <returns></returns> /// <returns></returns>
public static ServiceResult<T> Message(bool success, string msg, T response) public static ServiceResult<T> OprateSuccess(bool success, string message, T data)
{ {
return new ServiceResult<T>() { msg = msg, response = response, success = success }; return new ServiceResult<T>() { Message = message, Data = data, Success = success };
} }
} }
@ -88,19 +88,19 @@ public class ServiceResult
/// <summary> /// <summary>
/// 状态码 /// 状态码
/// </summary> /// </summary>
public int status { get; set; } = 200; public int Status { get; set; } = 200;
/// <summary> /// <summary>
/// 操作是否成功 /// 操作是否成功
/// </summary> /// </summary>
public bool success { get; set; } = false; public bool Success { get; set; } = false;
/// <summary> /// <summary>
/// 返回信息 /// 返回信息
/// </summary> /// </summary>
public string msg { get; set; } = ""; public string Message { get; set; } = "";
/// <summary> /// <summary>
/// 返回数据集合 /// 返回数据集合
/// </summary> /// </summary>
public object response { get; set; } public object Data { get; set; }
/// <summary> /// <summary>
/// 操作成功 /// 操作成功
@ -111,9 +111,9 @@ public class ServiceResult
{ {
return new ServiceResult return new ServiceResult
{ {
msg = msg, Message = msg,
success = true, Success = true,
response = null Data = null
}; };
} }
@ -127,9 +127,9 @@ public class ServiceResult
{ {
return new ServiceResult return new ServiceResult
{ {
msg = msg, Message = msg,
status = status, Status = status,
response = null Data = null
}; };
} }
} }

8
Tiobon.Core.Services/GuestbookServices.cs
Unescape View File

@ -74,8 +74,8 @@ namespace Tiobon.Core.Services
return new ServiceResult<string>() return new ServiceResult<string>()
{ {
success = true, Success = true,
msg = "操作完成" Message = "操作完成"
}; };
} }
catch (Exception) catch (Exception)
@ -88,8 +88,8 @@ namespace Tiobon.Core.Services
return new ServiceResult<string>() return new ServiceResult<string>()
{ {
success = false, Success = false,
msg = "操作异常" Message = "操作异常"
}; };
} }
} }

108
Tiobon.Core.Services/PayServices.cs
Unescape View File

@ -32,7 +32,7 @@ namespace Tiobon.Core.Services
{ {
_logger.LogInformation("支付开始"); _logger.LogInformation("支付开始");
ServiceResult<PayReturnResultModel> messageModel = new ServiceResult<PayReturnResultModel>(); ServiceResult<PayReturnResultModel> messageModel = new ServiceResult<PayReturnResultModel>();
messageModel.response = new PayReturnResultModel(); messageModel.Data = new PayReturnResultModel();
string url = string.Empty; string url = string.Empty;
string param = string.Empty; string param = string.Empty;
string returnData = string.Empty; string returnData = string.Empty;
@ -130,18 +130,18 @@ namespace Tiobon.Core.Services
string strCheckPars = StringHelper.GetPars(dicCheckPars); string strCheckPars = StringHelper.GetPars(dicCheckPars);
if (NotifyCheck(strCheckPars, payResult.SIGN, StaticPayInfo.pubKey)) if (NotifyCheck(strCheckPars, payResult.SIGN, StaticPayInfo.pubKey))
{ {
messageModel.success = true; messageModel.Success = true;
messageModel.msg = "支付成功"; messageModel.Message = "支付成功";
} }
else else
{ {
messageModel.success = false; messageModel.Success = false;
messageModel.msg = "签名失败"; messageModel.Message = "签名失败";
} }
break; break;
case "N": case "N":
messageModel.success = false; messageModel.Success = false;
messageModel.msg = "支付失败"; messageModel.Message = "支付失败";
break; break;
case "U": case "U":
case "Q": case "Q":
@ -152,22 +152,22 @@ namespace Tiobon.Core.Services
messageModel = await PayCheck(payModel, 1); messageModel = await PayCheck(payModel, 1);
break; break;
default: default:
messageModel.success = false; messageModel.Success = false;
messageModel.msg = "支付失败"; messageModel.Message = "支付失败";
break; break;
} }
messageModel.response.ORDERID = payResult.ORDERID; messageModel.Data.ORDERID = payResult.ORDERID;
messageModel.response.ERRCODE = payResult.ERRCODE; messageModel.Data.ERRCODE = payResult.ERRCODE;
messageModel.response.ERRMSG = payResult.ERRMSG; messageModel.Data.ERRMSG = payResult.ERRMSG;
messageModel.response.TRACEID = payResult.TRACEID; messageModel.Data.TRACEID = payResult.TRACEID;
messageModel.response.AMOUNT = payResult.AMOUNT; messageModel.Data.AMOUNT = payResult.AMOUNT;
messageModel.response.QRCODETYPE = payResult.QRCODETYPE; messageModel.Data.QRCODETYPE = payResult.QRCODETYPE;
} }
catch (Exception ex) catch (Exception ex)
{ {
messageModel.success = false; messageModel.Success = false;
messageModel.msg = "服务错误"; messageModel.Message = "服务错误";
messageModel.response.ERRMSG = ex.Message; messageModel.Data.ERRMSG = ex.Message;
_logger.LogInformation($"异常信息:{ex.Message}"); _logger.LogInformation($"异常信息:{ex.Message}");
_logger.LogInformation($"异常堆栈:{ex.StackTrace}"); _logger.LogInformation($"异常堆栈:{ex.StackTrace}");
} }
@ -182,7 +182,7 @@ namespace Tiobon.Core.Services
{ {
_logger.LogInformation("退款开始"); _logger.LogInformation("退款开始");
ServiceResult<PayRefundReturnResultModel> messageModel = new ServiceResult<PayRefundReturnResultModel>(); ServiceResult<PayRefundReturnResultModel> messageModel = new ServiceResult<PayRefundReturnResultModel>();
messageModel.response = new PayRefundReturnResultModel(); messageModel.Data = new PayRefundReturnResultModel();
try try
{ {
_logger.LogInformation($"原始GET参数->{_httpContextAccessor.HttpContext.Request.QueryString}"); _logger.LogInformation($"原始GET参数->{_httpContextAccessor.HttpContext.Request.QueryString}");
@ -223,31 +223,31 @@ namespace Tiobon.Core.Services
var Xmlresult = XmlHelper.ParseFormByXml<PayRefundReturnModel>(sResult, "TX"); var Xmlresult = XmlHelper.ParseFormByXml<PayRefundReturnModel>(sResult, "TX");
if (Xmlresult.RETURN_CODE.Equals("000000")) if (Xmlresult.RETURN_CODE.Equals("000000"))
{ {
messageModel.success = true; messageModel.Success = true;
messageModel.msg = "退款成功"; messageModel.Message = "退款成功";
} }
else else
{ {
messageModel.success = false; messageModel.Success = false;
messageModel.msg = "退款失败"; messageModel.Message = "退款失败";
} }
messageModel.response.RETURN_MSG = Xmlresult.RETURN_MSG; messageModel.Data.RETURN_MSG = Xmlresult.RETURN_MSG;
messageModel.response.TX_CODE = Xmlresult.TX_CODE; messageModel.Data.TX_CODE = Xmlresult.TX_CODE;
messageModel.response.REQUEST_SN = Xmlresult.REQUEST_SN; messageModel.Data.REQUEST_SN = Xmlresult.REQUEST_SN;
messageModel.response.RETURN_CODE = Xmlresult.RETURN_CODE; messageModel.Data.RETURN_CODE = Xmlresult.RETURN_CODE;
messageModel.response.CUST_ID = Xmlresult.CUST_ID; messageModel.Data.CUST_ID = Xmlresult.CUST_ID;
messageModel.response.LANGUAGE = Xmlresult.LANGUAGE; messageModel.Data.LANGUAGE = Xmlresult.LANGUAGE;
messageModel.response.AMOUNT = Xmlresult.TX_INFO?.AMOUNT; messageModel.Data.AMOUNT = Xmlresult.TX_INFO?.AMOUNT;
messageModel.response.PAY_AMOUNT = Xmlresult.TX_INFO?.PAY_AMOUNT; messageModel.Data.PAY_AMOUNT = Xmlresult.TX_INFO?.PAY_AMOUNT;
messageModel.response.ORDER_NUM = Xmlresult.TX_INFO?.ORDER_NUM; messageModel.Data.ORDER_NUM = Xmlresult.TX_INFO?.ORDER_NUM;
request.Dispose(); request.Dispose();
} }
catch (Exception ex) catch (Exception ex)
{ {
messageModel.success = false; messageModel.Success = false;
messageModel.msg = "服务错误"; messageModel.Message = "服务错误";
messageModel.response.RETURN_MSG = ex.Message; messageModel.Data.RETURN_MSG = ex.Message;
_logger.LogInformation($"异常信息:{ex.Message}"); _logger.LogInformation($"异常信息:{ex.Message}");
_logger.LogInformation($"异常堆栈:{ex.StackTrace}"); _logger.LogInformation($"异常堆栈:{ex.StackTrace}");
} }
@ -265,7 +265,7 @@ namespace Tiobon.Core.Services
_logger.LogInformation("轮询开始"); _logger.LogInformation("轮询开始");
ServiceResult<PayReturnResultModel> messageModel = new ServiceResult<PayReturnResultModel>(); ServiceResult<PayReturnResultModel> messageModel = new ServiceResult<PayReturnResultModel>();
messageModel.response = new PayReturnResultModel(); messageModel.Data = new PayReturnResultModel();
string url = string.Empty; string url = string.Empty;
string param = string.Empty; string param = string.Empty;
string returnData = string.Empty; string returnData = string.Empty;
@ -357,18 +357,18 @@ namespace Tiobon.Core.Services
string strCheckPars = StringHelper.GetPars(dicCheckPars); string strCheckPars = StringHelper.GetPars(dicCheckPars);
if (NotifyCheck(strCheckPars, payResult.SIGN, StaticPayInfo.pubKey)) if (NotifyCheck(strCheckPars, payResult.SIGN, StaticPayInfo.pubKey))
{ {
messageModel.success = true; messageModel.Success = true;
messageModel.msg = "支付成功"; messageModel.Message = "支付成功";
} }
else else
{ {
messageModel.success = false; messageModel.Success = false;
messageModel.msg = "签名失败"; messageModel.Message = "签名失败";
} }
break; break;
case "N": case "N":
messageModel.success = false; messageModel.Success = false;
messageModel.msg = "支付失败"; messageModel.Message = "支付失败";
break; break;
case "U": case "U":
case "Q": case "Q":
@ -379,22 +379,22 @@ namespace Tiobon.Core.Services
messageModel = await PayCheck(payModel, ++times); messageModel = await PayCheck(payModel, ++times);
break; break;
default: default:
messageModel.success = false; messageModel.Success = false;
messageModel.msg = "支付失败"; messageModel.Message = "支付失败";
break; break;
} }
messageModel.response.ORDERID = payResult.ORDERID; messageModel.Data.ORDERID = payResult.ORDERID;
messageModel.response.ERRCODE = payResult.ERRCODE; messageModel.Data.ERRCODE = payResult.ERRCODE;
messageModel.response.ERRMSG = payResult.ERRMSG; messageModel.Data.ERRMSG = payResult.ERRMSG;
messageModel.response.TRACEID = payResult.TRACEID; messageModel.Data.TRACEID = payResult.TRACEID;
messageModel.response.AMOUNT = payResult.AMOUNT; messageModel.Data.AMOUNT = payResult.AMOUNT;
messageModel.response.QRCODETYPE = payResult.QRCODETYPE; messageModel.Data.QRCODETYPE = payResult.QRCODETYPE;
} }
catch (Exception ex) catch (Exception ex)
{ {
messageModel.success = false; messageModel.Success = false;
messageModel.msg = "服务错误"; messageModel.Message = "服务错误";
messageModel.response.ERRMSG = ex.Message; messageModel.Data.ERRMSG = ex.Message;
_logger.LogInformation($"异常信息:{ex.Message}"); _logger.LogInformation($"异常信息:{ex.Message}");
_logger.LogInformation($"异常堆栈:{ex.StackTrace}"); _logger.LogInformation($"异常堆栈:{ex.StackTrace}");
} }

78
Tiobon.Core.Services/WeChatConfigServices.cs
Unescape View File

@ -44,7 +44,7 @@ namespace Tiobon.Core.Services
config.token = data.access_token; config.token = data.access_token;
config.tokenExpiration = DateTime.Now.AddSeconds(data.expires_in); config.tokenExpiration = DateTime.Now.AddSeconds(data.expires_in);
await this.Update(config); await this.Update(config);
return ServiceResult<WeChatApiDto>.OprateSuccess("",data); return ServiceResult<WeChatApiDto>.OprateSuccess("", data);
} }
else else
{ {
@ -72,8 +72,8 @@ namespace Tiobon.Core.Services
public async Task<ServiceResult<WeChatApiDto>> GetTemplate(string id) public async Task<ServiceResult<WeChatApiDto>> GetTemplate(string id)
{ {
var res = await GetToken(id); var res = await GetToken(id);
if (!res.success) return res; if (!res.Success) return res;
var data = await WeChatHelper.GetTemplate(res.response.access_token); var data = await WeChatHelper.GetTemplate(res.Data.access_token);
if (data.errcode.Equals(0)) if (data.errcode.Equals(0))
{ {
return ServiceResult<WeChatApiDto>.OprateSuccess("", data); return ServiceResult<WeChatApiDto>.OprateSuccess("", data);
@ -91,8 +91,8 @@ namespace Tiobon.Core.Services
public async Task<ServiceResult<WeChatApiDto>> GetMenu(string id) public async Task<ServiceResult<WeChatApiDto>> GetMenu(string id)
{ {
var res = await GetToken(id); var res = await GetToken(id);
if (!res.success) return res; if (!res.Success) return res;
var data = await WeChatHelper.GetMenu(res.response.access_token); var data = await WeChatHelper.GetMenu(res.Data.access_token);
if (data.errcode.Equals(0)) if (data.errcode.Equals(0))
{ {
return ServiceResult<WeChatApiDto>.OprateSuccess("", data); return ServiceResult<WeChatApiDto>.OprateSuccess("", data);
@ -105,14 +105,14 @@ namespace Tiobon.Core.Services
public async Task<ServiceResult<WeChatApiDto>> GetSubUsers(string id) public async Task<ServiceResult<WeChatApiDto>> GetSubUsers(string id)
{ {
var res = await GetToken(id); var res = await GetToken(id);
if (!res.success) return res; if (!res.Success) return res;
var data = await WeChatHelper.GetUsers(res.response.access_token); var data = await WeChatHelper.GetUsers(res.Data.access_token);
if (data.errcode.Equals(0)) if (data.errcode.Equals(0))
{ {
data.users = new List<WeChatApiDto>(); data.users = new List<WeChatApiDto>();
foreach (var openid in data.data.openid) 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<WeChatApiDto>.OprateSuccess("", data); return ServiceResult<WeChatApiDto>.OprateSuccess("", data);
} }
@ -121,11 +121,11 @@ namespace Tiobon.Core.Services
return ServiceResult<WeChatApiDto>.OprateSuccess($"\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<ServiceResult<WeChatApiDto>> GetSubUser(string id,string openid) public async Task<ServiceResult<WeChatApiDto>> GetSubUser(string id, string openid)
{ {
var res = await GetToken(id); var res = await GetToken(id);
if (!res.success) return res; if (!res.Success) return res;
var data = await WeChatHelper.GetUserInfo(res.response.access_token,openid); var data = await WeChatHelper.GetUserInfo(res.Data.access_token, openid);
if (data.errcode.Equals(0)) if (data.errcode.Equals(0))
{ {
return ServiceResult<WeChatApiDto>.OprateSuccess("", data); return ServiceResult<WeChatApiDto>.OprateSuccess("", data);
@ -135,7 +135,7 @@ namespace Tiobon.Core.Services
return ServiceResult<WeChatApiDto>.OprateSuccess($"\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) public async Task<string> Valid(WeChatValidDto validDto, string body)
{ {
WeChatXMLDto weChatData = null; WeChatXMLDto weChatData = null;
string objReturn = null; string objReturn = null;
@ -206,7 +206,7 @@ namespace Tiobon.Core.Services
public async Task<ServiceResult<WeChatResponseUserInfo>> GetQRBind(WeChatUserInfo info) public async Task<ServiceResult<WeChatResponseUserInfo>> GetQRBind(WeChatUserInfo info)
{ {
var res = await GetToken(info?.id); var res = await GetToken(info?.id);
if (!res.success) return ServiceResult<WeChatResponseUserInfo>.OprateFailed(res.msg); if (!res.Success) return ServiceResult<WeChatResponseUserInfo>.OprateFailed(res.Message);
var push = new WeChatQRDto var push = new WeChatQRDto
{ {
expire_seconds = 604800, expire_seconds = 604800,
@ -223,7 +223,7 @@ namespace Tiobon.Core.Services
reData.companyCode = info.companyCode; reData.companyCode = info.companyCode;
reData.id = info.id; reData.id = info.id;
var pushJosn = JsonHelper.GetJSON<WeChatQRDto>(push); var pushJosn = JsonHelper.GetJSON<WeChatQRDto>(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 WeChatQR weChatQR = new WeChatQR
{ {
QRbindCompanyID = info.companyCode, QRbindCompanyID = info.companyCode,
@ -235,17 +235,17 @@ namespace Tiobon.Core.Services
}; };
data.id = info.userID; data.id = info.userID;
await this.BaseDal.Db.Insertable<WeChatQR>(weChatQR).ExecuteCommandAsync(); await this.BaseDal.Db.Insertable<WeChatQR>(weChatQR).ExecuteCommandAsync();
reData.usersData= data; reData.usersData = data;
return ServiceResult<WeChatResponseUserInfo>.OprateSuccess("获取二维码成功", reData); return ServiceResult<WeChatResponseUserInfo>.OprateSuccess("获取二维码成功", reData);
} }
public async Task<ServiceResult<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(); 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) if (bindUser == null)
return ServiceResult<WeChatResponseUserInfo>.OprateFailed("用户不存在或者已经解绑!"); return ServiceResult<WeChatResponseUserInfo>.OprateFailed("用户不存在或者已经解绑!");
var res = await GetToken(msg?.info?.id); var res = await GetToken(msg?.info?.id);
if(!res.success) if (!res.Success)
return ServiceResult<WeChatResponseUserInfo>.OprateFailed(res.msg); return ServiceResult<WeChatResponseUserInfo>.OprateFailed(res.Message);
WeChatResponseUserInfo reData = new WeChatResponseUserInfo(); WeChatResponseUserInfo reData = new WeChatResponseUserInfo();
reData.companyCode = msg.info.companyCode; reData.companyCode = msg.info.companyCode;
reData.id = msg.info.id; reData.id = msg.info.id;
@ -296,7 +296,7 @@ namespace Tiobon.Core.Services
} }
}; };
var pushJson = JsonHelper.GetJSON<WeChatPushCardMsgDto>(pushData); var pushJson = JsonHelper.GetJSON<WeChatPushCardMsgDto>(pushData);
var data = await WeChatHelper.SendCardMsg(res.response.access_token, pushJson); var data = await WeChatHelper.SendCardMsg(res.Data.access_token, pushJson);
reData.usersData = data; reData.usersData = data;
try try
{ {
@ -336,10 +336,11 @@ namespace Tiobon.Core.Services
} }
public async Task<ServiceResult<WeChatApiDto>> PushTxtMsg(WeChatPushTestDto msg) { public async Task<ServiceResult<WeChatApiDto>> PushTxtMsg(WeChatPushTestDto msg)
{
var res = await GetToken(msg.selectWeChat); var res = await GetToken(msg.selectWeChat);
if (!res.success) return res; if (!res.Success) return res;
var token = res.response.access_token; var token = res.Data.access_token;
if (msg.selectBindOrSub.Equals("sub")) if (msg.selectBindOrSub.Equals("sub"))
{ {
return await PushText(token, msg); return await PushText(token, msg);
@ -347,7 +348,7 @@ namespace Tiobon.Core.Services
else else
{ {
ServiceResult<WeChatApiDto> messageModel = new ServiceResult<WeChatApiDto>(); ServiceResult<WeChatApiDto> messageModel = new ServiceResult<WeChatApiDto>();
messageModel.success = true; messageModel.Success = true;
//绑定用户 //绑定用户
if (msg.selectOperate.Equals("one")) if (msg.selectOperate.Equals("one"))
{ {
@ -357,11 +358,11 @@ namespace Tiobon.Core.Services
{ {
msg.selectUser = item.SubUserOpenID; msg.selectUser = item.SubUserOpenID;
var info = await PushText(token, msg); 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 else
@ -372,18 +373,19 @@ namespace Tiobon.Core.Services
{ {
msg.selectUser = item.SubUserOpenID; msg.selectUser = item.SubUserOpenID;
var info = await PushText(token, msg); 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; return messageModel;
} }
} }
public async Task<ServiceResult<WeChatApiDto>> PushText(string token,WeChatPushTestDto msg) { public async Task<ServiceResult<WeChatApiDto>> PushText(string token, WeChatPushTestDto msg)
{
object data = null; ; object data = null; ;
WeChatApiDto pushres = null; ; WeChatApiDto pushres = null; ;
@ -514,8 +516,8 @@ namespace Tiobon.Core.Services
{ {
WeChatHelper.ConverMenuButtonForEvent(menu); WeChatHelper.ConverMenuButtonForEvent(menu);
var res = await GetToken(menu.id); var res = await GetToken(menu.id);
if (!res.success) return res; if (!res.Success) return res;
var data = await WeChatHelper.SetMenu(res.response.access_token, JsonHelper.ObjToJson(menu.menu)); var data = await WeChatHelper.SetMenu(res.Data.access_token, JsonHelper.ObjToJson(menu.menu));
if (data.errcode.Equals(0)) if (data.errcode.Equals(0))
{ {
@ -528,11 +530,11 @@ namespace Tiobon.Core.Services
} }
public async Task<ServiceResult<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(); 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 ServiceResult<WeChatResponseUserInfo>.OprateFailed("用户不存在或者已经解绑!"); if (bindUser == null) return ServiceResult<WeChatResponseUserInfo>.OprateFailed("用户不存在或者已经解绑!");
var res = await GetToken(info.id); var res = await GetToken(info.id);
if(!res.success) return ServiceResult<WeChatResponseUserInfo>.OprateFailed(res.msg); if (!res.Success) return ServiceResult<WeChatResponseUserInfo>.OprateFailed(res.Message);
var token = res.response.access_token; var token = res.Data.access_token;
WeChatResponseUserInfo reData = new WeChatResponseUserInfo(); WeChatResponseUserInfo reData = new WeChatResponseUserInfo();
reData.companyCode = info.companyCode; reData.companyCode = info.companyCode;
reData.id = info.id; reData.id = info.id;
@ -549,14 +551,14 @@ namespace Tiobon.Core.Services
} }
public async Task<ServiceResult<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(); 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 ServiceResult<WeChatResponseUserInfo>.OprateFailed("用户不存在或者已经解绑!"); if (bindUser == null) return ServiceResult<WeChatResponseUserInfo>.OprateFailed("用户不存在或者已经解绑!");
WeChatResponseUserInfo reData = new WeChatResponseUserInfo(); WeChatResponseUserInfo reData = new WeChatResponseUserInfo();
reData.companyCode = info.companyCode; reData.companyCode = info.companyCode;
reData.id = info.id; reData.id = info.id;
bindUser.IsUnBind = true; bindUser.IsUnBind = true;
bindUser.SubUserRefTime = DateTime.Now; bindUser.SubUserRefTime = DateTime.Now;
await BaseDal.Db.Updateable<WeChatSub>(bindUser).UpdateColumns(t=> new{ t.IsUnBind,t.SubUserRefTime}).ExecuteCommandAsync(); await BaseDal.Db.Updateable<WeChatSub>(bindUser).UpdateColumns(t => new { t.IsUnBind, t.SubUserRefTime }).ExecuteCommandAsync();
return ServiceResult<WeChatResponseUserInfo>.OprateSuccess("用户解绑成功", reData); return ServiceResult<WeChatResponseUserInfo>.OprateSuccess("用户解绑成功", reData);
} }
@ -800,7 +802,7 @@ namespace Tiobon.Core.Services
var bindUser = await BaseDal.Db.Queryable<WeChatSub>().Where(t => t.SubFromPublicAccount == ticket.QRpublicAccount && t.CompanyID == ticket.QRbindCompanyID && t.SubJobID == ticket.QRbindJobID).SingleAsync(); var bindUser = await BaseDal.Db.Queryable<WeChatSub>().Where(t => t.SubFromPublicAccount == ticket.QRpublicAccount && t.CompanyID == ticket.QRbindCompanyID && t.SubJobID == ticket.QRbindJobID).SingleAsync();
bool isNewBind; bool isNewBind;
if (bindUser == null ) if (bindUser == null)
{ {
isNewBind = true; isNewBind = true;
bindUser = new WeChatSub bindUser = new WeChatSub

70
Tiobon.Core.Tasks/QuartzNet/SchedulerCenterServer.cs
Unescape View File

@ -56,14 +56,14 @@ namespace Tiobon.Core.Tasks
//等待任务运行完成 //等待任务运行完成
await this._scheduler.Result.Start(); await this._scheduler.Result.Start();
await Console.Out.WriteLineAsync("任务调度开启！"); await Console.Out.WriteLineAsync("任务调度开启！");
result.success = true; result.Success = true;
result.msg = $"任务调度开启成功"; result.Message = $"任务调度开启成功";
return result; return result;
} }
else else
{ {
result.success = false; result.Success = false;
result.msg = $"任务调度已经开启"; result.Message = $"任务调度已经开启";
return result; return result;
} }
} }
@ -87,14 +87,14 @@ namespace Tiobon.Core.Tasks
//等待任务运行完成 //等待任务运行完成
await this._scheduler.Result.Shutdown(); await this._scheduler.Result.Shutdown();
await Console.Out.WriteLineAsync("任务调度停止！"); await Console.Out.WriteLineAsync("任务调度停止！");
result.success = true; result.Success = true;
result.msg = $"任务调度停止成功"; result.Message = $"任务调度停止成功";
return result; return result;
} }
else else
{ {
result.success = false; result.Success = false;
result.msg = $"任务调度已经停止"; result.Message = $"任务调度已经停止";
return result; return result;
} }
} }
@ -121,14 +121,14 @@ namespace Tiobon.Core.Tasks
JobKey jobKey = new JobKey(tasksQz.Id.ToString(), tasksQz.JobGroup); JobKey jobKey = new JobKey(tasksQz.Id.ToString(), tasksQz.JobGroup);
if (await _scheduler.Result.CheckExists(jobKey)) if (await _scheduler.Result.CheckExists(jobKey))
{ {
result.success = false; result.Success = false;
result.msg = $"该任务计划已经在执行:【{tasksQz.Name}】,请勿重复启动！"; result.Message = $"该任务计划已经在执行:【{tasksQz.Name}】,请勿重复启动！";
return result; return result;
} }
if(tasksQz.TriggerType == 0 && tasksQz.CycleRunTimes != 0 && tasksQz.CycleHasRunTimes>=tasksQz.CycleRunTimes) if(tasksQz.TriggerType == 0 && tasksQz.CycleRunTimes != 0 && tasksQz.CycleHasRunTimes>=tasksQz.CycleRunTimes)
{ {
result.success = false; result.Success = false;
result.msg = $"该任务计划已完成:【{tasksQz.Name}】,无需重复启动,如需启动请修改已循环次数再提交"; result.Message = $"该任务计划已完成:【{tasksQz.Name}】,无需重复启动,如需启动请修改已循环次数再提交";
return result; return result;
} }
#region 设置开始时间和结束时间 #region 设置开始时间和结束时间
@ -185,21 +185,21 @@ namespace Tiobon.Core.Tasks
//await Task.Delay(TimeSpan.FromSeconds(120)); //await Task.Delay(TimeSpan.FromSeconds(120));
//await Console.Out.WriteLineAsync("关闭了调度器！"); //await Console.Out.WriteLineAsync("关闭了调度器！");
//await _scheduler.Result.Shutdown(); //await _scheduler.Result.Shutdown();
result.success = true; result.Success = true;
result.msg = $"【{tasksQz.Name}】成功"; result.Message = $"【{tasksQz.Name}】成功";
return result; return result;
} }
catch (Exception ex) catch (Exception ex)
{ {
result.success = false; result.Success = false;
result.msg = $"任务计划异常:【{ex.Message}】"; result.Message = $"任务计划异常:【{ex.Message}】";
return result; return result;
} }
} }
else else
{ {
result.success = false; result.Success = false;
result.msg = $"任务计划不存在:【{tasksQz?.Name}】"; result.Message = $"任务计划不存在:【{tasksQz?.Name}】";
return result; return result;
} }
} }
@ -232,15 +232,15 @@ namespace Tiobon.Core.Tasks
JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup); JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup);
if (!await _scheduler.Result.CheckExists(jobKey)) if (!await _scheduler.Result.CheckExists(jobKey))
{ {
result.success = false; result.Success = false;
result.msg = $"未找到要暂停的任务:【{sysSchedule.Name}】"; result.Message = $"未找到要暂停的任务:【{sysSchedule.Name}】";
return result; return result;
} }
else else
{ {
await this._scheduler.Result.DeleteJob(jobKey); await this._scheduler.Result.DeleteJob(jobKey);
result.success = true; result.Success = true;
result.msg = $"【{sysSchedule.Name}】成功"; result.Message = $"【{sysSchedule.Name}】成功";
return result; return result;
} }
} }
@ -263,13 +263,13 @@ namespace Tiobon.Core.Tasks
JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup); JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup);
if (!await _scheduler.Result.CheckExists(jobKey)) if (!await _scheduler.Result.CheckExists(jobKey))
{ {
result.success = false; result.Success = false;
result.msg = $"未找到要恢复的任务:【{sysSchedule.Name}】"; result.Message = $"未找到要恢复的任务:【{sysSchedule.Name}】";
return result; return result;
} }
await this._scheduler.Result.ResumeJob(jobKey); await this._scheduler.Result.ResumeJob(jobKey);
result.success = true; result.Success = true;
result.msg = $"【{sysSchedule.Name}】成功"; result.Message = $"【{sysSchedule.Name}】成功";
return result; return result;
} }
catch (Exception) catch (Exception)
@ -290,13 +290,13 @@ namespace Tiobon.Core.Tasks
JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup); JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup);
if (!await _scheduler.Result.CheckExists(jobKey)) if (!await _scheduler.Result.CheckExists(jobKey))
{ {
result.success = false; result.Success = false;
result.msg = $"未找到要暂停的任务:【{sysSchedule.Name}】"; result.Message = $"未找到要暂停的任务:【{sysSchedule.Name}】";
return result; return result;
} }
await this._scheduler.Result.PauseJob(jobKey); await this._scheduler.Result.PauseJob(jobKey);
result.success = true; result.Success = true;
result.msg = $"【{sysSchedule.Name}】成功"; result.Message = $"【{sysSchedule.Name}】成功";
return result; return result;
} }
catch (Exception) catch (Exception)
@ -474,19 +474,19 @@ namespace Tiobon.Core.Tasks
//停止任务 //停止任务
await StopScheduleJobAsync(tasksQz); await StopScheduleJobAsync(tasksQz);
result.success = true; result.Success = true;
result.msg = $"立即执行计划任务:【{tasksQz.Name}】成功"; result.Message = $"立即执行计划任务:【{tasksQz.Name}】成功";
} }
else else
{ {
await _scheduler.Result.TriggerJob(jobKey); await _scheduler.Result.TriggerJob(jobKey);
result.success = true; result.Success = true;
result.msg = $"立即执行计划任务:【{tasksQz.Name}】成功"; result.Message = $"立即执行计划任务:【{tasksQz.Name}】成功";
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
result.msg = $"立即执行计划任务失败:【{ex.Message}】"; result.Message = $"立即执行计划任务失败:【{ex.Message}】";
} }
return result; return result;

32
Tiobon.Core.Tests/Controller_Test/BlogController_Should.cs
Unescape View File

@ -46,8 +46,8 @@ namespace Tiobon.Core.Tests
{ {
ServiceResult<PageModel<TiobonArticle>> Tiobons = await TiobonController.Get(1, 1, "技术博文", ""); ServiceResult<PageModel<TiobonArticle>> Tiobons = await TiobonController.Get(1, 1, "技术博文", "");
Assert.NotNull(Tiobons); Assert.NotNull(Tiobons);
Assert.NotNull(Tiobons.response); Assert.NotNull(Tiobons.Data);
Assert.True(Tiobons.response.dataCount >= 0); Assert.True(Tiobons.Data.dataCount >= 0);
} }
[Fact] [Fact]
@ -80,9 +80,9 @@ namespace Tiobon.Core.Tests
ServiceResult<List<TiobonArticle>> Tiobons = await TiobonController.GetTiobonsByTypesForMVP("技术博文"); ServiceResult<List<TiobonArticle>> Tiobons = await TiobonController.GetTiobonsByTypesForMVP("技术博文");
Assert.NotNull(Tiobons); Assert.NotNull(Tiobons);
Assert.True(Tiobons.success); Assert.True(Tiobons.Success);
Assert.NotNull(Tiobons.response); Assert.NotNull(Tiobons.Data);
Assert.True(Tiobons.response.Count >= 0); Assert.True(Tiobons.Data.Count >= 0);
} }
[Fact] [Fact]
@ -91,8 +91,8 @@ namespace Tiobon.Core.Tests
ServiceResult<TiobonArticle> Tiobon = await TiobonController.GetTiobonByIdForMVP(1); ServiceResult<TiobonArticle> Tiobon = await TiobonController.GetTiobonByIdForMVP(1);
Assert.NotNull(Tiobon); Assert.NotNull(Tiobon);
Assert.True(Tiobon.success); Assert.True(Tiobon.Success);
Assert.NotNull(Tiobon.response); Assert.NotNull(Tiobon.Data);
} }
[Fact] [Fact]
@ -108,9 +108,9 @@ namespace Tiobon.Core.Tests
var res = await TiobonController.Post(TiobonArticle); 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); Assert.NotNull(data);
} }
@ -128,9 +128,9 @@ namespace Tiobon.Core.Tests
var res = await TiobonController.AddForMVP(TiobonArticle); 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); Assert.NotNull(data);
} }
@ -149,9 +149,9 @@ namespace Tiobon.Core.Tests
var res = await TiobonController.Put(TiobonArticle); 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); Assert.NotNull(data);
} }
@ -161,9 +161,9 @@ namespace Tiobon.Core.Tests
{ {
var res = await TiobonController.Delete(99); 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); Assert.Null(data);
} }
@ -173,7 +173,7 @@ namespace Tiobon.Core.Tests
{ {
var res = await TiobonController.ApacheTestUpdate(); var res = await TiobonController.ApacheTestUpdate();
Assert.True(res.success); Assert.True(res.Success);
} }
} }
} }

Write Preview
Loading…
Cancel
Save