代码优化

master
xiaochanghai 1 year ago
parent f49ec845c2
commit b77f16fa4f
  1. 2
      Tiobon.Core.Api/Controllers/Ghra_GradeController.cs
  2. 2
      Tiobon.Core.Api/Controllers/SplitDemoController.cs
  3. 4
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  4. 4
      Tiobon.Core.Model/ServiceResult.cs
  5. 20
      Tiobon.Core.Services/WeChatConfigServices.cs

@ -37,7 +37,7 @@
{ {
var entity = await _service.QueryById(Id); var entity = await _service.QueryById(Id);
if (entity == null) if (entity == null)
return ServiceResult<Ghra_GradeDto>.Fail("获取失败"); return ServiceResult<Ghra_GradeDto>.OprateFailed("获取失败");
else else
return new ServiceResult<Ghra_GradeDto>() { msg = "获取成功", success = true, response = entity }; return new ServiceResult<Ghra_GradeDto>() { msg = "获取成功", success = true, response = entity };
} }

@ -55,7 +55,7 @@
} }
else else
{ {
return ServiceResult<SplitDemo>.Fail("获取失败"); return ServiceResult<SplitDemo>.OprateFailed("获取失败");
} }
} }

@ -2168,14 +2168,14 @@
<param name="response">数据</param> <param name="response">数据</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Tiobon.Core.Model.ServiceResult`1.Fail(System.String)"> <member name="M:Tiobon.Core.Model.ServiceResult`1.OprateFailed(System.String)">
<summary> <summary>
返回失败 返回失败
</summary> </summary>
<param name="msg">消息</param> <param name="msg">消息</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Tiobon.Core.Model.ServiceResult`1.Fail(System.String,`0)"> <member name="M:Tiobon.Core.Model.ServiceResult`1.OprateFailed(System.String,`0)">
<summary> <summary>
返回失败 返回失败
</summary> </summary>

@ -51,7 +51,7 @@ public class ServiceResult<T>
/// </summary> /// </summary>
/// <param name="msg">消息</param> /// <param name="msg">消息</param>
/// <returns></returns> /// <returns></returns>
public static ServiceResult<T> Fail(string msg) public static ServiceResult<T> OprateFailed(string msg)
{ {
return Message(false, msg, default); return Message(false, msg, default);
} }
@ -61,7 +61,7 @@ public class ServiceResult<T>
/// <param name="msg">消息</param> /// <param name="msg">消息</param>
/// <param name="response">数据</param> /// <param name="response">数据</param>
/// <returns></returns> /// <returns></returns>
public static ServiceResult<T> Fail(string msg, T response) public static ServiceResult<T> OprateFailed(string msg, T response)
{ {
return Message(false, msg, response); return Message(false, msg, response);
} }

@ -48,7 +48,7 @@ namespace Tiobon.Core.Services
} }
else else
{ {
return ServiceResult<WeChatApiDto>.Fail($"\r\n获取Token失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}"); return ServiceResult<WeChatApiDto>.OprateFailed($"\r\n获取Token失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}");
} }
} }
public async Task<ServiceResult<WeChatApiDto>> RefreshToken(string publicAccount) public async Task<ServiceResult<WeChatApiDto>> RefreshToken(string publicAccount)
@ -66,7 +66,7 @@ namespace Tiobon.Core.Services
} }
else else
{ {
return ServiceResult<WeChatApiDto>.Fail($"\r\n获取Token失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}"); return ServiceResult<WeChatApiDto>.OprateFailed($"\r\n获取Token失败\r\n错误代码:{data.errcode}\r\n错误信息:{data.errmsg}");
} }
} }
public async Task<ServiceResult<WeChatApiDto>> GetTemplate(string id) public async Task<ServiceResult<WeChatApiDto>> GetTemplate(string id)
@ -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>.Fail(res.msg); if (!res.success) return ServiceResult<WeChatResponseUserInfo>.OprateFailed(res.msg);
var push = new WeChatQRDto var push = new WeChatQRDto
{ {
expire_seconds = 604800, expire_seconds = 604800,
@ -242,10 +242,10 @@ namespace Tiobon.Core.Services
{ {
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>.Fail("用户不存在或者已经解绑!"); 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>.Fail(res.msg); return ServiceResult<WeChatResponseUserInfo>.OprateFailed(res.msg);
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;
@ -507,7 +507,7 @@ namespace Tiobon.Core.Services
} }
else else
{ {
return ServiceResult<WeChatApiDto>.Fail($"\r\n推送失败\r\n错误代码:{pushres.errcode}\r\n错误信息:{pushres.errmsg}", pushres); return ServiceResult<WeChatApiDto>.OprateFailed($"\r\n推送失败\r\n错误代码:{pushres.errcode}\r\n错误信息:{pushres.errmsg}", pushres);
} }
} }
public async Task<ServiceResult<WeChatApiDto>> UpdateMenu(WeChatApiDto menu) public async Task<ServiceResult<WeChatApiDto>> UpdateMenu(WeChatApiDto menu)
@ -529,9 +529,9 @@ 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>.Fail("用户不存在或者已经解绑!"); 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>.Fail(res.msg); if(!res.success) return ServiceResult<WeChatResponseUserInfo>.OprateFailed(res.msg);
var token = res.response.access_token; var token = res.response.access_token;
WeChatResponseUserInfo reData = new WeChatResponseUserInfo(); WeChatResponseUserInfo reData = new WeChatResponseUserInfo();
reData.companyCode = info.companyCode; reData.companyCode = info.companyCode;
@ -544,13 +544,13 @@ namespace Tiobon.Core.Services
} }
else else
{ {
return ServiceResult<WeChatResponseUserInfo>.Fail("用户信息获取失败", reData); return ServiceResult<WeChatResponseUserInfo>.OprateFailed("用户信息获取失败", reData);
} }
} }
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>.Fail("用户不存在或者已经解绑!"); 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;

Loading…
Cancel
Save