diff --git a/docker-compose.yml b/docker-compose.yml index d126b85..5a91942 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ container_name: nas_robot_proxy restart: always ports: - - 35642:80 # 开放端口 + - 14902:80 # 开放端口 environment: - TZ=Asia/Shanghai - HTPASSWD=suncheng:$$apr1$$2QX32QHP$$HIGAbCuTt8jxdc4uDzNLI1 diff --git a/src/Service/Jobs/ChineseNfoRegistry.cs b/src/Service/Jobs/ChineseNfoRegistry.cs index 3697448..6b9d242 100644 --- a/src/Service/Jobs/ChineseNfoRegistry.cs +++ b/src/Service/Jobs/ChineseNfoRegistry.cs @@ -19,12 +19,15 @@ public class ChineseNfoRegistry : Registry, IChineseNfoRegistry _configuration = configuration; _logger = logger; + var httpClientHandler = new HttpClientHandler(); + var proxyAddress = _configuration["ChineseNfo:HttpProxy"]; - var httpClientHandler = new HttpClientHandler + + if(string.IsNullOrEmpty(proxyAddress) == false) { - Proxy = string.IsNullOrEmpty(proxyAddress) ? null : new WebProxy(proxyAddress, false), - UseProxy = !string.IsNullOrEmpty(proxyAddress) - }; + httpClientHandler.Proxy = string.IsNullOrEmpty(proxyAddress) ? null : new WebProxy(proxyAddress, false); + httpClientHandler.UseProxy = !string.IsNullOrEmpty(proxyAddress); + } _client = new HttpClient(httpClientHandler); _client.BaseAddress = new Uri("https://api.themoviedb.org"); diff --git a/src/WebApi/appsettings.json b/src/WebApi/appsettings.json index ce9abfb..55c92dc 100644 --- a/src/WebApi/appsettings.json +++ b/src/WebApi/appsettings.json @@ -51,15 +51,15 @@ "HealthyTasks": [ { "ContainerName": "netdata_proxy", - "Url": "http://192.168.31.14:19999" + "Url": "http://192.168.31.14:14402" }, { "ContainerName": "nas_robot_proxy", - "Url": "http://192.168.31.14:35642/swagger/index.html" + "Url": "http://192.168.31.14:14902/swagger/index.html" } ], "ChineseNfo": { "TvFolder": "/data/tv", - "HttpProxy": "http://192.168.31.14:47890" + "HttpProxy": "" } }