feat: update

RayWangQvQ · Mar 7, 2023 · d7a7571 · d7a7571
1 parent 06d6c14
commit d7a7571
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -109,3 +109,5 @@
 - Feature #473 : let user input when there is no target task in configs
 ## 1.0.2
 - Fix #484 : fix read dic config error
+- Merge PR #472 : add reverse proxy host for telegram notification
+- Merge PR #483 : update login field for entrypoint
diff --git a/src/Ray.BiliBiliTool.Console/Program.cs b/src/Ray.BiliBiliTool.Console/Program.cs
@@ -81,7 +81,8 @@ internal static IHostBuilder CreateHostBuilder(string[] args)
                 //用户机密：
                 if (env.IsDevelopment() && env.ApplicationName?.Length > 0)
                 {
-                    var appAssembly = Assembly.Load(new AssemblyName(env.ApplicationName));
+                    //var appAssembly = Assembly.Load(new AssemblyName(env.ApplicationName));
+                    var appAssembly = Assembly.GetAssembly(typeof(Program));
                     configurationBuilder.AddUserSecrets(appAssembly, optional: true, reloadOnChange: true);
                 }
 

diff --git a/src/Ray.BiliBiliTool.Console/appsettings.json b/src/Ray.BiliBiliTool.Console/appsettings.json
@@ -114,7 +114,7 @@
           "chatId": "",
           "restrictedToMinimumLevel": "Information",
           "proxy": "", //代理，user:password@host:port
-          "apiHost": "" 
+          "apiHost": "https://api.telegram.org" //可以替换成自己搭建的反代host（https://hostloc.com/thread-805441-1-1.html）
         }
       },
       //4.企业微信机器人（https://work.weixin.qq.com/api/doc/90000/90136/91770）

diff --git a/src/Ray.Serilog.Sinks/Ray.Serilog.Sinks.TelegramBatched/TelegramApiClient.cs b/src/Ray.Serilog.Sinks/Ray.Serilog.Sinks.TelegramBatched/TelegramApiClient.cs
@@ -14,7 +14,7 @@ public class TelegramApiClient : PushService
 
         private readonly string _chatId;
         private readonly string _proxy;
-        private const string TelegramBotApiUrl = "https://api.telegram.org/bot";
+        private const string DefaultTelegramBotApiHost = "https://api.telegram.org";
 
         /// <summary>
         /// The API URL.
@@ -42,12 +42,9 @@ public TelegramApiClient(string botToken, string chatId, string proxy = "", stri
 
             _chatId = chatId;
             _proxy = proxy;
-            var botApiUrl = TelegramBotApiUrl;
-            if (!string.IsNullOrWhiteSpace(apiHost))
-            {
-                botApiUrl = apiHost;
-            }
-            this._apiUrl = new Uri($"{botApiUrl}{botToken}/sendMessage");
+
+            var botApiHost = string.IsNullOrWhiteSpace(apiHost)? DefaultTelegramBotApiHost:apiHost;
+            this._apiUrl = new Uri($"{botApiHost}/bot{botToken}/sendMessage");
 
             if (proxy.IsNotNullOrEmpty())
             {

diff --git a/test/LogTest/TestTelegram.cs b/test/LogTest/TestTelegram.cs
@@ -18,8 +18,8 @@ public class TestTelegram
 
         public TestTelegram()
         {
-            Environment.SetEnvironmentVariable("ASPNETCORE_ENVIRONMENT", "Development");
-            Program.CreateHost(new string[] { });
+            Environment.SetEnvironmentVariable("DOTNET_ENVIRONMENT", "Development");
+            Program.CreateHost(new string[] { "ENVIRONMENT=Development" });
 
             _botToken = Global.ConfigurationRoot["Serilog:WriteTo:3:Args:botToken"];
             _chatId = Global.ConfigurationRoot["Serilog:WriteTo:3:Args:chatId"];