Merge branch 'master' into wxw

wxw

2024-08-17 0464969366317154fdbb51e106ca778b855bdd08

 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);
                };