[fix]<GeoApi> 修复GeoApi无法正常加密的问题

zxbmmmmmmmmm · Mar 23, 2024 · 299adde · 299adde
1 parent a4e9cab
commit 299adde
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/FluentWeather.QWeatherApi/ApiContracts/GeolocationApi.cs b/FluentWeather.QWeatherApi/ApiContracts/GeolocationApi.cs
@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
@@ -19,22 +20,11 @@ public class GeolocationApi<TResponse>: QApiContractBase<IQGeolocationRequest,TR
 
         public override string Path => ApiConstants.Geolocation.CityLookup;
 
-        public override Task<HttpRequestMessage> GenerateRequestMessageAsync(ApiHandlerOption option)
+        public override async Task<HttpRequestMessage> GenerateRequestMessageAsync(ApiHandlerOption option)
         {
-            var sb = new StringBuilder(Url);
-            string query = GenerateQuery(option).ToString();
-            sb.Append(Path).Append("?").Append(query);
-
-            var requestMessage = new HttpRequestMessage(Method,sb.ToString());
-
-            var cookies = option.Cookies.ToDictionary(t => t.Key, t => t.Value);
-            foreach (var keyValuePair in Cookies)
-            {
-                cookies[keyValuePair.Key] = keyValuePair.Value;
-            }
-            if (cookies.Count > 0)
-                requestMessage.Headers.Add("Cookie", string.Join("; ", cookies.Select(c => $"{c.Key}={c.Value}")));
-            return Task.FromResult(requestMessage);
+            var result = await base.GenerateRequestMessageAsync(option);
+            result.RequestUri = new Uri(result.RequestUri.ToString().Replace("/api.qweather.com", "/geoapi.qweather.com").Replace("/devapi.qweather.com", "/geoapi.qweather.com"));
+            return result;
         }
         protected override NameValueCollection GenerateQuery(ApiHandlerOption option)
         {

diff --git a/FluentWeather.Uwp/Helpers/LocationHelper.cs b/FluentWeather.Uwp/Helpers/LocationHelper.cs
@@ -12,6 +12,7 @@
 using FluentWeather.Uwp.Controls.Dialogs;
 using FluentWeather.Uwp.Shared;
 using FluentWeather.Uwp.Controls.Dialogs.QWeather;
+using FluentWeather.Abstraction.Models.Exceptions;
 
 namespace FluentWeather.Uwp.Helpers;
 
@@ -60,7 +61,7 @@ public static async Task<GeolocationBase> GetGeolocation()
                 }
                 return city.First();
             }
-            catch
+            catch(HttpResponseException)
             {
                 await new SetTokenDialog().ShowAsync();
             }