Merge pull request #1001 from RayWangQvQ/develop

Release 3.8.0

Author: RayWangQvQ

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.8.0
+- Feature: 使推送的更版本号信息更简洁
+- Fix[#998]: 修复企业微信 App 推送缺少 access_token 问题
+- Fix[#996]: 修复 Server 酱推送标题不能为空的问题
+- Fix[#669]: 企业微信默认消息类型从 markdown 改为 text
 ## 3.7.0
 - Fix[#989]: 修复钉钉推送标题不能为空的问题
 ## 3.6.0

Directory.Packages.props

@@ -45,16 +45,16 @@
     <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageVersion Include="Serilog.Sinks.SQLite.Microsoft" Version="1.0.0" />
     <!-- Ray Serilog Sinks -->
-    <PackageVersion Include="Ray.Serilog.Sinks.CoolPushBatched" Version="0.1.1" />
-    <PackageVersion Include="Ray.Serilog.Sinks.DingTalkBatched" Version="0.1.1" />
-    <PackageVersion Include="Ray.Serilog.Sinks.GotifyBatched" Version="0.1.1" />
-    <PackageVersion Include="Ray.Serilog.Sinks.MicrosoftTeamsBatched" Version="0.1.1" />
-    <PackageVersion Include="Ray.Serilog.Sinks.OtherApiBatched" Version="0.1.1" />
-    <PackageVersion Include="Ray.Serilog.Sinks.PushPlusBatched" Version="0.1.1" />
-    <PackageVersion Include="Ray.Serilog.Sinks.ServerChanBatched" Version="0.1.1" />
-    <PackageVersion Include="Ray.Serilog.Sinks.TelegramBatched" Version="0.1.1" />
-    <PackageVersion Include="Ray.Serilog.Sinks.WorkWeiXinAppBatched" Version="0.1.1" />
-    <PackageVersion Include="Ray.Serilog.Sinks.WorkWeiXinBatched" Version="0.1.1" />
+    <PackageVersion Include="Ray.Serilog.Sinks.CoolPushBatched" Version="0.1.5" />
+    <PackageVersion Include="Ray.Serilog.Sinks.DingTalkBatched" Version="0.1.5" />
+    <PackageVersion Include="Ray.Serilog.Sinks.GotifyBatched" Version="0.1.5" />
+    <PackageVersion Include="Ray.Serilog.Sinks.MicrosoftTeamsBatched" Version="0.1.5" />
+    <PackageVersion Include="Ray.Serilog.Sinks.OtherApiBatched" Version="0.1.5" />
+    <PackageVersion Include="Ray.Serilog.Sinks.PushPlusBatched" Version="0.1.5" />
+    <PackageVersion Include="Ray.Serilog.Sinks.ServerChanBatched" Version="0.1.5" />
+    <PackageVersion Include="Ray.Serilog.Sinks.TelegramBatched" Version="0.1.5" />
+    <PackageVersion Include="Ray.Serilog.Sinks.WorkWeiXinAppBatched" Version="0.1.5" />
+    <PackageVersion Include="Ray.Serilog.Sinks.WorkWeiXinBatched" Version="0.1.5" />
     <!-- Quartz -->
     <PackageVersion Include="Quartz" Version="3.14.0" />
     <PackageVersion Include="Quartz.AspNetCore" Version="3.14.0" />
@@ -77,4 +77,4 @@
     <PackageVersion Include="coverlet.collector" Version="6.0.4" />
     <PackageVersion Include="FluentAssertions" Version="8.5.0" />
   </ItemGroup>
-</Project>
+</Project>

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Authors>Ray</Authors>
-    <Version>3.7.0</Version>
+    <Version>3.8.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
   </PropertyGroup>
 </Project>

src/Ray.BiliBiliTool.Console/BiliBiliToolHostedService.cs

@@ -145,9 +145,7 @@ private void LogAppInfo()
         logger.LogInformation(Environment.NewLine + "========================");
         logger.LogInformation(
             "v{version} 开源 by {url}",
-            typeof(Program)
-                .Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()
-                ?.InformationalVersion,
+            typeof(Program).Assembly.GetName().Version?.ToString(),
             Constants.SourceCodeUrl + Environment.NewLine
         );
         //_logger.LogInformation("【当前IP】{ip} ", IpHelper.GetIp());

src/Ray.BiliBiliTool.Web/Jobs/BaseJob.cs

@@ -33,9 +33,7 @@ public async Task Execute(IJobExecutionContext context)
                 logger.LogInformation("---");
                 logger.LogInformation(
                     "v{version} 开源 by {url}",
-                    typeof(Program)
-                        .Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()
-                        ?.InformationalVersion,
+                    typeof(Program).Assembly.GetName().Version?.ToString(),
                     Config.Constants.SourceCodeUrl + Environment.NewLine
                 );
             }

test/LogTest/TestWorkWeiXin.cs

@@ -25,7 +25,7 @@ public TestWorkWeiXin()
         [Fact]
         public async Task Test2()
         {
-            var client = new WorkWeiXinApiClient(_key);
+            var client = new WorkWeiXinApiClient(_key, WorkWeiXinMsgType.text);
 
             //string msg = LogConstants.Msg;
             string msg = LogConstants.Msg2;