TANG JIANG 1 jaar geleden
bovenliggende
commit
de97e1a46b

+ 5 - 1
src/DataSharing/DataExchange/DataExchangePusherProviderService.cs

@@ -43,7 +43,11 @@ namespace DataSharing.DataExchange
 
             var config = _channelConfigurationManager.GetConfigurationCityHandOver();
 
-            var response = await _dataExchangeClient.ExecuteAsync<DataExchangeResponseDto>(config.BaseUrl + dto.Path, dto.HttpMethod, dto.Request, cancellationToken);
+            var baseAddress = config.BaseUrl;
+            if (!baseAddress.EndsWith('/'))
+                baseAddress += "/";
+
+            var response = await _dataExchangeClient.ExecuteAsync<DataExchangeResponseDto>(baseAddress + dto.Path, dto.HttpMethod, dto.Request, cancellationToken);
 
             //如果推送成功修改数据状态
             if (response != null)

+ 5 - 1
src/DataSharing/Enterprise/EnterprisePusherProviderService.cs

@@ -66,7 +66,11 @@ namespace DataSharing.Enterprise
                     try
                     {
                         #region 读取数据
-                        string url = string.Format("{0}{1}?Source={2}&Id={3}", businessFile.BaseUrl, businessFile.DownloadUrlAddress, businessFile.Source, item.FileId);
+                        var baseAddress = businessFile.BaseUrl;
+                        if (!baseAddress.EndsWith('/'))
+                            baseAddress += "/";
+
+                        string url = string.Format("{0}{1}?Source={2}&Id={3}", baseAddress, businessFile.DownloadUrlAddress, businessFile.Source, item.FileId);
                         using (var client = _httpClientFactory.CreateClient())
                         using (var response = await client.GetAsync(url))
                         {

+ 15 - 11
src/DataSharing/FwDataExchange/FwClient.cs

@@ -81,7 +81,11 @@ namespace DataSharing.FwDataExchange
             var configSendDataOld = channelconfigManager.GetConfigurationSendDataOld();
             string url = $"api/token?ClientID={configSendDataOld.ClientID}&Secret={configSendDataOld.Secret}";
 
-            var toke = await httpInvoker.RequestStringContentAsync<FwToken>(configSendDataOld.AddressUrl + url, "Get",
+            var baseAddress = configSendDataOld.AddressUrl;
+            if (!baseAddress.EndsWith('/'))
+                baseAddress += "/";
+
+            var toke = await httpInvoker.RequestStringContentAsync<FwToken>(baseAddress + url, "Get",
                     null, d => d.SetHttpClient(configSendDataOld.AddressUrl), cancellationToken);
 
             if (toke is null || toke.data is null)
@@ -93,22 +97,22 @@ namespace DataSharing.FwDataExchange
             return dataToken;
         }
 
-       /// <summary>
-       /// 请求,不带token
-       /// </summary>
-       /// <typeparam name="TResponse"></typeparam>
-       /// <param name="url"></param>
-       /// <param name="httpMethod"></param>
-       /// <param name="stringContent"></param>
-       /// <param name="cancellationToken"></param>
-       /// <returns></returns>
+        /// <summary>
+        /// 请求,不带token
+        /// </summary>
+        /// <typeparam name="TResponse"></typeparam>
+        /// <param name="url"></param>
+        /// <param name="httpMethod"></param>
+        /// <param name="stringContent"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
         public async Task<TResponse?> RequestNoTokenAsync<TResponse>(string url, string httpMethod, string? stringContent = null, CancellationToken cancellationToken = default)
         {
             using var scope = _scopeFactory.CreateScope();
             var provider = scope.ServiceProvider;
             var channelconfigManager = provider.GetRequiredService<IChannelConfigurationManager>();
             var httpInvoker = provider.GetRequiredService<IHttpInvoker>();
-         
+
             var configHotlineClient = channelconfigManager.GetConfigurationHotlineClient();
             var postUrl = configHotlineClient.AddressUrl + url;
             return await httpInvoker.RequestStringContentAsync<TResponse>(postUrl, httpMethod, stringContent,

+ 15 - 3
src/DataSharing/Province/PusherProviderService.cs

@@ -197,7 +197,12 @@ namespace DataSharing.Province
                     var request = new ProvinceRequest<GetCaseDistrecordSendInfo>(configProvince.ClientId, configProvince.ClientSecret);
                     request.SetData(distrecordSendInfo);
                     var jsonData = request.ToString();
-                    var url = configProvince.XieTong + "rest/market/get_case_distrecord_send";
+
+                    var baseAddress = configProvince.XieTong;
+                    if (!baseAddress.EndsWith('/'))
+                        baseAddress += "/";
+
+                    var url = baseAddress + "rest/market/get_case_distrecord_send";
                     #endregion
 
                     var response = await _xieTongClient.RequestAsync<ProvinceDistrecordResponse>(url, "Post", jsonData, cancellationToken);
@@ -258,7 +263,10 @@ namespace DataSharing.Province
             byte[] fileContentBytes = null;
             try
             {
-                string url = string.Format("{0}{1}?Source={2}&Id={3}", businessFile.BaseUrl, businessFile.DownloadUrlAddress, "hotline", fileId);
+                var baseAddress = businessFile.BaseUrl;
+                if (!baseAddress.EndsWith('/'))
+                    baseAddress += "/";
+                string url = string.Format("{0}{1}?Source={2}&Id={3}", baseAddress, businessFile.DownloadUrlAddress, "hotline", fileId);
                 using (var client = _httpClientFactory.CreateClient())
                 using (var response = await client.GetAsync(url))
                 {
@@ -287,7 +295,11 @@ namespace DataSharing.Province
                     CFormUpload.FileParameter fileParameter = new CFormUpload.FileParameter("files", fileContentBytes, fileName, null);
                     dicParam.Add(fileName, fileParameter);
 
-                    string strUrl = configProvince.HuiJu + "get_case_material_info";
+                    var baseAddressHuiJu = configProvince.HuiJu;
+                    if (!baseAddressHuiJu.EndsWith('/'))
+                        baseAddressHuiJu += "/";
+
+                    string strUrl = baseAddressHuiJu + "get_case_material_info";
                     // 上传附件
                     string strResult = CFormUpload.MultipartFormDataPost(strUrl, null, dicParam, strToken);