feat(JuHeIpLocatorProvider): bump version 10.1.0 #946
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,16 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Razor"> | ||
|
|
||
| <PropertyGroup> | ||
| <Version>10.1.0</Version> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <PackageTags>Bootstrap Blazor WebAssembly wasm UI Components JuHe Ip Locator</PackageTags> | ||
| <Description>Bootstrap UI components extensions of JuHeIpLocator</Description> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="BootstrapBlazor" Version="10.4.0" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,31 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the Apache 2.0 License | ||
| // See the LICENSE file in the project root for more information. | ||
| // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone | ||
|
|
||
| namespace BootstrapBlazor.Components; | ||
|
|
||
| /// <summary> | ||
| /// <para lang="zh">聚合搜索引擎 IP 定位器配置类</para> | ||
| /// <para lang="en">JuHe IP locator options</para> | ||
| /// </summary> | ||
| class JuHeIpLocatorOptions | ||
| { | ||
| /// <summary> | ||
| /// <para lang="zh">获得/设置 聚合搜索引擎 IP 定位器 AppKey</para> | ||
| /// <para lang="en">Gets or sets the JuHe IP locator AppKey</para> | ||
| /// </summary> | ||
| public string? Key { get; set; } | ||
|
|
||
| /// <summary> | ||
| /// <para lang="zh">获得/设置 聚合搜索引擎 IP 定位器请求地址</para> | ||
| /// <para lang="en">Gets or sets the JuHe IP locator request URL</para> | ||
| /// </summary> | ||
| public string? Url { get; set; } | ||
|
|
||
| /// <summary> | ||
| /// <para lang="zh">获得/设置 聚合搜索引擎 IP 定位器请求超时时间 默认 5 秒</para> | ||
| /// <para lang="en">Gets or sets the JuHe IP locator request timeout, default is 5 seconds</para> | ||
| /// </summary> | ||
| public TimeSpan Timeout { get; set; } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,17 +1,16 @@ | ||||||
| // Copyright (c) Argo Zhang (argo@163.com). All rights reserved. | ||||||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | ||||||
| // Website: https://www.blazor.zone or https://argozhang.github.io/ | ||||||
|
|
||||||
| using Microsoft.Extensions.Logging; | ||||||
| using Microsoft.Extensions.Options; | ||||||
| using System.Net.Http.Json; | ||||||
|
|
||||||
| namespace BootstrapBlazor.Components; | ||||||
|
|
||||||
| /// <summary> | ||||||
| /// <para lang="zh">聚合搜索引擎 IP 定位器</para> | ||||||
| /// <para lang="en">JuHe IP locator provider</para> | ||||||
| /// </summary> | ||||||
| /// <param name="httpClientFactory"></param> | ||||||
| /// <param name="options"></param> | ||||||
|
|
@@ -26,6 +25,8 @@ class JuHeIpLocatorProvider(IHttpClientFactory httpClientFactory, | |||||
|
|
||||||
| private JuHeIpLocatorOptions? _options; | ||||||
|
|
||||||
| private const string Url = "http://apis.juhe.cn/ip/ipNewV3"; | ||||||
|
There was a problem hiding this comment. 🚨 suggestion (security): Consider using HTTPS instead of HTTP for the default JuHe API URL to avoid sending IP data over an unencrypted channel. This constant currently uses plain HTTP. If There was a problem hiding this comment. The default URL uses
Suggested change
|
||||||
|
|
||||||
| /// <summary> | ||||||
| /// <inheritdoc/> | ||||||
| /// </summary> | ||||||
|
|
@@ -52,164 +53,42 @@ private JuHeIpLocatorOptions GetOptions() | |||||
| { | ||||||
| var options = juHeIpLocatorOptions.Value; | ||||||
|
|
||||||
| if (string.IsNullOrEmpty(options.Key)) | ||||||
| { | ||||||
| LastError = $"{nameof(JuHeIpLocatorOptions)}:Key not value in appsettings configuration file. 未配置 {nameof(JuHeIpLocatorOptions)}:Key 请在 appsettings.json 中配置 {nameof(JuHeIpLocatorOptions)}:Key"; | ||||||
|
There was a problem hiding this comment. The English portion of the error message "Key not value in appsettings configuration file" is grammatically incorrect. It should read something like "Key has no value in appsettings configuration file" or "Key is not configured in appsettings configuration file".
Suggested change
|
||||||
| Log(LastError); | ||||||
|
|
||||||
| } | ||||||
|
Comment on lines
+56
to
61
There was a problem hiding this comment. When |
||||||
| if (string.IsNullOrEmpty(options.Url)) | ||||||
| { | ||||||
| options.Url = Url; | ||||||
| } | ||||||
| return options; | ||||||
| } | ||||||
|
|
||||||
| /// <summary> | ||||||
| /// <para lang="zh">请求获得地理位置接口方法</para> | ||||||
| /// <para lang="en">Fetches the geolocation data</para> | ||||||
| /// </summary> | ||||||
| /// <param name="url"></param> | ||||||
| /// <param name="client"></param> | ||||||
| /// <param name="token"></param> | ||||||
| protected virtual async Task<string?> Fetch(string url, HttpClient client, CancellationToken token) | ||||||
| { | ||||||
| var result = await client.GetFromJsonAsync<JuHeLocationResult>(url, token); | ||||||
| if (result != null && result.ErrorCode != 0) | ||||||
| { | ||||||
| LastError = $"ErrorCode: {result.ErrorCode} Reason: {result.Reason}"; | ||||||
| Log(LastError); | ||||||
| } | ||||||
| return result?.ToString(); | ||||||
| } | ||||||
|
|
||||||
| private void Log(string? message) | ||||||
| { | ||||||
| if (logger.IsEnabled(LogLevel.Error)) | ||||||
| { | ||||||
| logger.LogError("{message}", message); | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This component hardcodes
BootstrapBlazorversion10.4.0while every other component in the repository uses$(BBVersion)(currently10.0.0, defined insrc/Directory.Build.props:25). This breaks the convention for centralized dependency version management and could lead to version inconsistencies across the solution. Consider using$(BBVersion)here as well, or updatingBBVersioncentrally if a newer version is needed.