TANG JIANG 1 년 전
부모
커밋
c1d123d82a
2개의 변경된 파일6개의 추가작업 그리고 2개의 파일을 삭제
  1. 4 1
      src/DataSharing/Enterprise/EnterpriseClient.cs
  2. 2 1
      src/DataSharing/Enterprise/EnterpriseHttpClientExtensions.cs

+ 4 - 1
src/DataSharing/Enterprise/EnterpriseClient.cs

@@ -44,8 +44,11 @@ namespace DataSharing.Enterprise
                    TimeSpan.FromMinutes(118));
             _logger.LogWarning("请求接口地址:--------------" + url);
             var configEnterprise = channelconfigManager.GetConfigurationEnterprise();
+            string baseAddress = configEnterprise.AddressUrl;
+            if (!baseAddress.EndsWith('/'))
+                baseAddress += "/";
             return await httpInvoker.RequestStringContentAsync<TResponse>(url, httpMethod, stringContent,
-                d => d.SetHttpClient(configEnterprise.AddressUrl, token), cancellationToken);
+                d => d.SetHttpClient(baseAddress, token), cancellationToken);
         }
 
         /// <summary>

+ 2 - 1
src/DataSharing/Enterprise/EnterpriseHttpClientExtensions.cs

@@ -11,8 +11,9 @@ namespace DataSharing.Enterprise
         {
             if (tokenInfo == null || string.IsNullOrEmpty(tokenInfo.AccessToken))
                 throw new UserFriendlyException("无效token");
-            httpClient.SetToken(tokenInfo.TokenType, tokenInfo.AccessToken);
+           // httpClient.SetToken(tokenInfo.TokenType, tokenInfo.AccessToken);
             httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+            httpClient.DefaultRequestHeaders.Add("Blade-Auth", $"{tokenInfo.TokenType} {tokenInfo.AccessToken}");
 
             return httpClient;
         }