|
|
@@ -59,7 +59,8 @@ public class TokenHubService : ITokenHubService, IDisposable
|
|
|
{
|
|
|
_logger.LogWarning(ex, ex.ErrorDetail?.Message ?? "-");
|
|
|
|
|
|
- var message = TokenHubErrorExtensions.GetMessage(ex.ErrorCode);
|
|
|
+ var message = ex.ErrorDetail?.Message_ZH
|
|
|
+ ?? TokenHubErrorExtensions.GetMessage(ex.ErrorCode);
|
|
|
|
|
|
throw new TokenHubException(message, 400, ex.ErrorDetail);
|
|
|
}
|
|
|
@@ -110,9 +111,12 @@ public class TokenHubService : ITokenHubService, IDisposable
|
|
|
{
|
|
|
await SendStreamRequestAsync(request, onChunk, cancellationToken);
|
|
|
}
|
|
|
- catch (TokenHubException)
|
|
|
+ catch (TokenHubException ex)
|
|
|
{
|
|
|
- throw;
|
|
|
+ var message = ex.ErrorDetail?.Message_ZH
|
|
|
+ ?? TokenHubErrorExtensions.GetMessage(ex.ErrorCode);
|
|
|
+
|
|
|
+ throw new TokenHubException(message, 400, ex.ErrorDetail);
|
|
|
}
|
|
|
catch (TaskCanceledException ex) when (ex.CancellationToken == cancellationToken)
|
|
|
{
|
|
|
@@ -502,6 +506,7 @@ public class TokenHubService : ITokenHubService, IDisposable
|
|
|
Type = simpleError.TryGetProperty("type", out var t) ? t.GetString() : null,
|
|
|
Code = simpleError.TryGetProperty("code", out var c) ? c.GetString() : null,
|
|
|
Message = simpleError.TryGetProperty("message", out var m) ? m.GetString() : null,
|
|
|
+ Message_ZH = simpleError.TryGetProperty("message_zh", out var m_zh) ? m_zh.GetString() : null,
|
|
|
RequestId = simpleError.TryGetProperty("request_id", out var r) ? r.GetString() : null
|
|
|
};
|
|
|
}
|
|
|
@@ -531,6 +536,9 @@ public class TokenHubService : ITokenHubService, IDisposable
|
|
|
if (errorElement.TryGetProperty("message", out var message))
|
|
|
error.Message = message.GetString();
|
|
|
|
|
|
+ if (errorElement.TryGetProperty("message_zh", out var message_zh))
|
|
|
+ error.Message_ZH = message_zh.GetString();
|
|
|
+
|
|
|
if (errorElement.TryGetProperty("source", out var source))
|
|
|
error.Source = source.GetString();
|
|
|
|
|
|
@@ -562,6 +570,9 @@ public class TokenHubService : ITokenHubService, IDisposable
|
|
|
if (errorElement.TryGetProperty("message", out var message))
|
|
|
error.Message = message.GetString();
|
|
|
|
|
|
+ if (errorElement.TryGetProperty("message_zh", out var message_zh))
|
|
|
+ error.Message_ZH = message_zh.GetString();
|
|
|
+
|
|
|
if (errorElement.TryGetProperty("reqid", out var reqid))
|
|
|
error.RequestId = reqid.GetString();
|
|
|
|