diff --git a/Tiobon.Core.Api/Controllers/Ghra_GradeController.cs b/Tiobon.Core.Api/Controllers/Ghra_GradeController.cs index b8513574..4d115093 100644 --- a/Tiobon.Core.Api/Controllers/Ghra_GradeController.cs +++ b/Tiobon.Core.Api/Controllers/Ghra_GradeController.cs @@ -37,7 +37,7 @@ { var entity = await _service.QueryById(Id); if (entity == null) - return ServiceResult.Fail("获取失败"); + return ServiceResult.OprateFailed("获取失败"); else return new ServiceResult() { msg = "获取成功", success = true, response = entity }; } diff --git a/Tiobon.Core.Api/Controllers/SplitDemoController.cs b/Tiobon.Core.Api/Controllers/SplitDemoController.cs index ed581c3d..addb8d2f 100644 --- a/Tiobon.Core.Api/Controllers/SplitDemoController.cs +++ b/Tiobon.Core.Api/Controllers/SplitDemoController.cs @@ -55,7 +55,7 @@ } else { - return ServiceResult.Fail("获取失败"); + return ServiceResult.OprateFailed("获取失败"); } } diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index f1dda205..4753b07f 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -2168,14 +2168,14 @@ 数据 - + 返回失败 消息 - + 返回失败 diff --git a/Tiobon.Core.Model/ServiceResult.cs b/Tiobon.Core.Model/ServiceResult.cs index cf126dbb..e044700a 100644 --- a/Tiobon.Core.Model/ServiceResult.cs +++ b/Tiobon.Core.Model/ServiceResult.cs @@ -51,7 +51,7 @@ public class ServiceResult /// /// 消息 /// - public static ServiceResult Fail(string msg) + public static ServiceResult OprateFailed(string msg) { return Message(false, msg, default); } @@ -61,7 +61,7 @@ public class ServiceResult /// 消息 /// 数据 /// - public static ServiceResult Fail(string msg, T response) + public static ServiceResult OprateFailed(string msg, T response) { return Message(false, msg, response); } diff --git a/Tiobon.Core.Services/WeChatConfigServices.cs b/Tiobon.Core.Services/WeChatConfigServices.cs index e664a051..6e7693e0 100644 --- a/Tiobon.Core.Services/WeChatConfigServices.cs +++ b/Tiobon.Core.Services/WeChatConfigServices.cs @@ -48,7 +48,7 @@ namespace Tiobon.Core.Services } else { - return ServiceResult.Fail($"\r\n获取Token失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}"); + return ServiceResult.OprateFailed($"\r\n获取Token失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}"); } } public async Task> RefreshToken(string publicAccount) @@ -66,7 +66,7 @@ namespace Tiobon.Core.Services } else { - return ServiceResult.Fail($"\r\n获取Token失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}"); + return ServiceResult.OprateFailed($"\r\n获取Token失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}"); } } public async Task> GetTemplate(string id) @@ -206,7 +206,7 @@ namespace Tiobon.Core.Services public async Task> GetQRBind(WeChatUserInfo info) { var res = await GetToken(info?.id); - if (!res.success) return ServiceResult.Fail(res.msg); + if (!res.success) return ServiceResult.OprateFailed(res.msg); var push = new WeChatQRDto { expire_seconds = 604800, @@ -242,10 +242,10 @@ namespace Tiobon.Core.Services { var bindUser = await BaseDal.Db.Queryable().Where(t => t.SubFromPublicAccount == msg.info.id && t.CompanyID == msg.info.companyCode && t.IsUnBind == false && msg.info.userID.Contains(t.SubJobID)).SingleAsync(); if (bindUser == null) - return ServiceResult.Fail("用户不存在或者已经解绑!"); + return ServiceResult.OprateFailed("用户不存在或者已经解绑!"); var res = await GetToken(msg?.info?.id); if(!res.success) - return ServiceResult.Fail(res.msg); + return ServiceResult.OprateFailed(res.msg); WeChatResponseUserInfo reData = new WeChatResponseUserInfo(); reData.companyCode = msg.info.companyCode; reData.id = msg.info.id; @@ -507,7 +507,7 @@ namespace Tiobon.Core.Services } else { - return ServiceResult.Fail($"\r\n推送失败\r\n错误代码:{pushres.errcode}\r\n错误信息:{pushres.errmsg}", pushres); + return ServiceResult.OprateFailed($"\r\n推送失败\r\n错误代码:{pushres.errcode}\r\n错误信息:{pushres.errmsg}", pushres); } } public async Task> UpdateMenu(WeChatApiDto menu) @@ -529,9 +529,9 @@ namespace Tiobon.Core.Services public async Task> GetBindUserInfo(WeChatUserInfo info) { var bindUser = await BaseDal.Db.Queryable().Where(t => t.SubFromPublicAccount == info.id && t.CompanyID == info.companyCode && info.userID.Equals(t.SubJobID) && t.IsUnBind == false ).FirstAsync(); - if (bindUser == null) return ServiceResult.Fail("用户不存在或者已经解绑!"); + if (bindUser == null) return ServiceResult.OprateFailed("用户不存在或者已经解绑!"); var res = await GetToken(info.id); - if(!res.success) return ServiceResult.Fail(res.msg); + if(!res.success) return ServiceResult.OprateFailed(res.msg); var token = res.response.access_token; WeChatResponseUserInfo reData = new WeChatResponseUserInfo(); reData.companyCode = info.companyCode; @@ -544,13 +544,13 @@ namespace Tiobon.Core.Services } else { - return ServiceResult.Fail("用户信息获取失败", reData); + return ServiceResult.OprateFailed("用户信息获取失败", reData); } } public async Task> UnBind(WeChatUserInfo info) { var bindUser = await BaseDal.Db.Queryable().Where(t => t.SubFromPublicAccount == info.id && t.CompanyID == info.companyCode && info.userID.Equals(t.SubJobID) && t.IsUnBind == false ).FirstAsync(); - if (bindUser == null) return ServiceResult.Fail("用户不存在或者已经解绑!"); + if (bindUser == null) return ServiceResult.OprateFailed("用户不存在或者已经解绑!"); WeChatResponseUserInfo reData = new WeChatResponseUserInfo(); reData.companyCode = info.companyCode; reData.id = info.id;