From e295e8d91ab7a699007c1224ad1cff8252f37f38 Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gmail.com>
Date: Wed, 4 Sep 2024 04:50:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/PayController.cs              | 20 ++++++++++---------
 .../HuanMeng.MiaoYu.WebPayApi.csproj          |  1 +
 .../appsettings.json                          | 16 ++++++++++++---
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/2-api/HuanMeng.MiaoYu.WebPayApi/Controllers/PayController.cs b/src/2-api/HuanMeng.MiaoYu.WebPayApi/Controllers/PayController.cs
index be14dea..2d5e188 100644
--- a/src/2-api/HuanMeng.MiaoYu.WebPayApi/Controllers/PayController.cs
+++ b/src/2-api/HuanMeng.MiaoYu.WebPayApi/Controllers/PayController.cs
@@ -54,8 +54,16 @@ namespace HuanMeng.MiaoYu.WebPayApi.Controllers
         [HttpPost("{tenant?}/{pay?}/{orderId?}/{sign?}")]
         public async Task<string> Post(string? tenant, string? pay, string? orderId, string? sign)
         {
-            #region 验证签名
             var context = httpContextAccessor.HttpContext;
+            context.Request.EnableBuffering(); // Enable buffering to allow the body to be read multiple times
+            using (var reader = new StreamReader(context.Request.Body, Encoding.UTF8, true, 1024, leaveOpen: true))
+            {
+                var bodyContent = await reader.ReadToEndAsync();
+                logger.LogInformation($"请求支付回调接口，请求路径: {context.Request.Path}, 请求Body: {bodyContent}");
+                context.Request.Body.Position = 0;
+            }
+            #region 验证签名
+           
             var orderInfo = PaymentExtend.ParseCustomString(orderId);
             string newSign = $"{tenant}{orderId}{orderInfo.UserId}";
             newSign = MD5Encryption.ComputeMD5Hash(newSign);
@@ -109,7 +117,7 @@ namespace HuanMeng.MiaoYu.WebPayApi.Controllers
                 await dao.daoDbMiaoYu.context.SaveChangesAsync();
                 return $"error;用户不存在";
             }
-            using (IDbContextTransaction transaction = dao.daoDbMiaoYu.context.Database.BeginTransaction(System.Data.IsolationLevel.RepeatableRead))
+            using (IDbContextTransaction transaction = dao.daoDbMiaoYu.context.Database.BeginTransaction(System.Data.IsolationLevel.ReadUncommitted))
             {
                 try
                 {
@@ -133,13 +141,7 @@ namespace HuanMeng.MiaoYu.WebPayApi.Controllers
                 }
             }
             redis.KeyDelete(baseKey);
-            context.Request.EnableBuffering(); // Enable buffering to allow the body to be read multiple times
-            using (var reader = new StreamReader(context.Request.Body, Encoding.UTF8, true, 1024, leaveOpen: true))
-            {
-                var bodyContent = await reader.ReadToEndAsync();
-                logger.LogInformation($"请求支付回调接口，请求路径: {context.Request.Path}, 请求Body: {bodyContent}");
-                context.Request.Body.Position = 0;
-            }
+
 
             return $"success";
         }
diff --git a/src/2-api/HuanMeng.MiaoYu.WebPayApi/HuanMeng.MiaoYu.WebPayApi.csproj b/src/2-api/HuanMeng.MiaoYu.WebPayApi/HuanMeng.MiaoYu.WebPayApi.csproj
index 9a3079a..f0d0831 100644
--- a/src/2-api/HuanMeng.MiaoYu.WebPayApi/HuanMeng.MiaoYu.WebPayApi.csproj
+++ b/src/2-api/HuanMeng.MiaoYu.WebPayApi/HuanMeng.MiaoYu.WebPayApi.csproj
@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
     <PackageReference Include="Serilog" Version="4.0.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+    <PackageReference Include="Serilog.Expressions" Version="5.0.0" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
diff --git a/src/2-api/HuanMeng.MiaoYu.WebPayApi/appsettings.json b/src/2-api/HuanMeng.MiaoYu.WebPayApi/appsettings.json
index a39ff30..3612c9e 100644
--- a/src/2-api/HuanMeng.MiaoYu.WebPayApi/appsettings.json
+++ b/src/2-api/HuanMeng.MiaoYu.WebPayApi/appsettings.json
@@ -9,7 +9,7 @@
   "Serilog": {
     "Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File" ],
     "MinimumLevel": {
-      "Default": "Information",
+      "Default": "Debug",
       "Override": {
         "Microsoft": "Warning",
         "System": "Warning"
@@ -35,7 +35,12 @@
           "restrictedToMinimumLevel": "Error", //写入日志的级别  //包括 Verbose、Debug、Information、Warning、Error 和 Fatal
           "shared": true //不占用文件
           // "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] {Message}{NewLine}{Exception}"
-        }
+        },
+        "Filter": [
+          {
+            "Expression": "Level == 'Error'"
+          }
+        ]
       },
       {
         "Name": "File",
@@ -45,7 +50,12 @@
           "restrictedToMinimumLevel": "Debug", //写入日志的级别  //包括 Verbose、Debug、Information、Warning、Error 和 Fatal
           "shared": true //不占用文件
           // "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] {Message}{NewLine}{Exception}"
-        }
+        },
+        "Filter": [
+          {
+            "Expression": "Level == 'Debug'"
+          }
+        ]
       }
     ],
     "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ]