Merge branch 'master' into features/UserManger

This commit is contained in:
2021-07-01 15:48:20 +08:00
37 changed files with 1565 additions and 1331 deletions

View File

@@ -41,6 +41,20 @@ namespace Ewide.Core
// 解析异常信息
var (StatusCode, ErrorCode, Errors) = UnifyContext.GetExceptionMetadata(context);
// 如果是代码自行抛出的异常,视为接口调用成功,返回结果失败
if (context.Exception.GetType() == typeof(Furion.FriendlyException.AppFriendlyException))
{
return DisplayJson(new RestfulResult<object>
{
Code = StatusCodes.Status200OK,
Success = false,
Data = null,
Message = Errors,
Extras = UnifyContext.Take(),
Timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()
});
}
return DisplayJson(new RestfulResult<object>
{
Code = StatusCode,

View File

@@ -431,7 +431,7 @@ namespace Ewide.Core.Service
///<summary>
///发送验证码
/// </summary>
[HttpPost("/sysUser/SendCode")]
[HttpPost("/sysUser/sendCode")]
public async Task<dynamic> SendCode(Usermailphone input)
{
var Orgcode_Key = "ewide_Orgcode";
@@ -505,7 +505,7 @@ namespace Ewide.Core.Service
///<summary>
///检验验证码并且绑定
/// </summary>
[HttpPost("/sysUser/CheckBindcode")]
[HttpPost("/sysUser/checkBindcode")]
public async Task<dynamic> CheckBindcode(Usermailphone input)
{
var Orgcode_Key = "ewide_Orgcode";