From 0464969366317154fdbb51e106ca778b855bdd08 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 17 八月 2024 15:45:28 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Wms/Utility/Extension/ApplicationBuilderExtensions.cs | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/Wms/Utility/Extension/ApplicationBuilderExtensions.cs b/Wms/Utility/Extension/ApplicationBuilderExtensions.cs
index 5c72390..3ea0774 100644
--- a/Wms/Utility/Extension/ApplicationBuilderExtensions.cs
+++ b/Wms/Utility/Extension/ApplicationBuilderExtensions.cs
@@ -53,16 +53,27 @@
if (!string.IsNullOrEmpty(token))
{
var handler = new JwtSecurityTokenHandler();
- var jwtToken = handler.ReadJwtToken(token);
- var claim = jwtToken.Payload.Claims.FirstOrDefault(s => s.Type == "LoginName");
- //foreach (var claim in jwtToken.Payload.Claims)
- //{
- // Console.WriteLine($"{claim.Type}: {claim.Value}");
- //}
- if (claim != null)
- diagnosticContext.Set("_UserName", claim.Value);
- else
- diagnosticContext.Set("_UserName", "");
+ try
+ {
+ var jwtToken = handler.ReadJwtToken(token);
+ var claim = jwtToken.Payload.Claims.FirstOrDefault(s => s.Type == "LoginName");
+ //foreach (var claim in jwtToken.Payload.Claims)
+ //{
+ // Console.WriteLine($"{claim.Type}: {claim.Value}");
+ //}
+ if (claim != null)
+ diagnosticContext.Set("_UserName", claim.Value);
+ else
+ diagnosticContext.Set("_UserName", "");
+ }
+ catch (Exception)
+ {
+
+ }
+ }
+ else
+ {
+ diagnosticContext.Set("_UserName", "");
}
//璇锋眰body
var requestContent = "{}";
@@ -74,6 +85,14 @@
if (requestReader.BaseStream.Length != 0)
requestContent = requestReader.ReadToEnd();
}
+ if (httpContext.Request.RouteValues["controller"].ToString().ToLower() == "upapi"|| httpContext.Request.RouteValues["controller"].ToString().ToLower() == "downapi")
+ {
+ diagnosticContext.Set("ExternalSystems", true);
+ }
+ else
+ {
+ diagnosticContext.Set("ExternalSystems", false);
+ }
diagnosticContext.Set("_RequestBody", requestContent);
diagnosticContext.Set("_Service", AppDomain.CurrentDomain.FriendlyName);
};
--
Gitblit v1.8.0