diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj index b4bf1a3e..35389390 100644 --- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj +++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj @@ -42,7 +42,7 @@ - + diff --git a/Admin.NET/Admin.NET.Core/EventBus/AppEventSubscriber.cs b/Admin.NET/Admin.NET.Core/EventBus/AppEventSubscriber.cs index ebaaa436..396247cf 100644 --- a/Admin.NET/Admin.NET.Core/EventBus/AppEventSubscriber.cs +++ b/Admin.NET/Admin.NET.Core/EventBus/AppEventSubscriber.cs @@ -38,7 +38,7 @@ public class AppEventSubscriber : IEventSubscriber, ISingleton, IDisposable [EventSubscribe(CommonConst.SendErrorMail)] public async Task SendOrderErrorMail(EventHandlerExecutingContext context) { - //var mailTempPath = Path.Combine(App.WebHostEnvironment.WebRootPath, "Temp\\ErrorMail.tp"); + //var mailTempPath = Path.Combine(App.WebHostEnvironment.WebRootPath, "Temp", "ErrorMail.tp"); //var mailTemp = File.ReadAllText(mailTempPath); //var mail = await _serviceScope.ServiceProvider.GetRequiredService().RunCompileFromCachedAsync(mailTemp, ); diff --git a/Admin.NET/Admin.NET.Core/Service/Wechat/SysWxOpenService.cs b/Admin.NET/Admin.NET.Core/Service/Wechat/SysWxOpenService.cs index 52cb9161..abe9aa6b 100644 --- a/Admin.NET/Admin.NET.Core/Service/Wechat/SysWxOpenService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Wechat/SysWxOpenService.cs @@ -195,12 +195,7 @@ public class SysWxOpenService : IDynamicApiController, ITransient public string VerifySignature([FromQuery] VerifySignatureInput input) { bool valid = _wechatApiClient.VerifyEventSignatureForEcho(input.Timestamp, input.Nonce, input.Signature); - if (!valid) - { - return "fail"; - } - - return input.Echostr; + return !valid ? "fail" : input.Echostr; } /// @@ -300,17 +295,15 @@ public class SysWxOpenService : IDynamicApiController, ITransient if (response.IsSuccessful()) { var QRImagePath = App.GetConfig("Wechat:QRImagePath"); - //判断文件存放路径是否存在 + // 判断文件存放路径是否存在 if (!Directory.Exists(QRImagePath)) - { Directory.CreateDirectory(QRImagePath); - } + // 将二维码图片数据保存为文件 - var filePath = QRImagePath + $"\\{input.ImageName.ToUpper()}.png"; + var filePath = Path.Combine(QRImagePath, $"{input.ImageName.ToUpper()}.png"); if (File.Exists(filePath)) - { File.Delete(filePath); - } + File.WriteAllBytes(filePath, response.GetRawBytes()); generateQRImageOutInput.Success = true;