OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -11768,51 +11768,44 @@ FROM
                         //境内费用(其他费用)
                         if (_EnterExitCosts.ChoiceOne == 1)
                         {
-                            string row1_1 = "";
+                            string row1 = "";
                             if (_EnterExitCosts.Visa > 0)
                             {
                                 //insidePayTotal += _EnterExitCosts.Visa;
-                                row1_1 = $"签证费：{_EnterExitCosts.Visa:#0.00} 元/人";
+                                row1 = $"签证费：{_EnterExitCosts.Visa:#0.00} 元/人\r\n";
                                 //if (!string.IsNullOrEmpty(_EnterExitCosts.VisaRemark))
                                 //{
                                 //    row1_1 += $"\t签证费用描述： {_EnterExitCosts.VisaRemark} 人民币/人";
                                 //}
                             }
 
-                            string row1_2 = "";
                             if (_EnterExitCosts.YiMiao > 0)
                             {
                                 //insidePayTotal += _EnterExitCosts.YiMiao;
-                                row1_2 += $"疫苗费：{_EnterExitCosts.YiMiao:#0.00} 元/人";
+                                row1 += $"疫苗费：{_EnterExitCosts.YiMiao:#0.00} 元/人\r\n";
                             }
                             if (_EnterExitCosts.HeSuan > 0)
                             {
                                 //insidePayTotal += _EnterExitCosts.HeSuan;
-                                row1_2 += $"核酸检测费：{_EnterExitCosts.HeSuan:#0.00} 元/人";
+                                row1 += $"核酸检测费：{_EnterExitCosts.HeSuan:#0.00} 元/人\r\n";
                             }
                             if (_EnterExitCosts.Service > 0)
                             {
                                 //insidePayTotal += _EnterExitCosts.Service;
-                                row1_2 += $"服务费：{_EnterExitCosts.Service:#0.00} 元/人";
+                                row1 += $"服务费：{_EnterExitCosts.Service:#0.00} 元/人\r\n";
                             }
-
-                            string row1_3 = "";
                             if (_EnterExitCosts.Safe > 0)
                             {
                                 //insidePayTotal += _EnterExitCosts.Safe;
-                                row1_3 += $"保险费：{_EnterExitCosts.Safe:#0.00} 元/人";
+                                row1 += $"保险费：{_EnterExitCosts.Safe:#0.00} 元/人\r\n";
                             }
                             if (_EnterExitCosts.Ticket > 0)
                             {
                                 //insidePayTotal += _EnterExitCosts.Ticket;
-                                row1_3 += $"参展门票：{_EnterExitCosts.Ticket:#0.00} 元/人";
+                                row1 += $"参展门票：{_EnterExitCosts.Ticket:#0.00} 元/人\r\n";
                             }
 
-                            string row1 = "";
-                            if (!string.IsNullOrEmpty(row1_1)) row1 += $"{row1_1}\r\n";
-                            if (!string.IsNullOrEmpty(row1_2)) row1 += $"{row1_2}\r\n";
-                            if (!string.IsNullOrEmpty(row1_3)) row1 += $"{row1_3}\r\n";
-                            row1 += $"备注：{_EnterExitCosts.Remark}";
+                            row1 += $"备注：{_EnterExitCosts.FirstItemRemark}";
 
                             dic.Add("InsidePay", insidePayTotal.ToString("#0.00"));
                             dic.Add("Row1Str", row1);
@@ -12072,7 +12065,7 @@ FROM
                         //else dic.Add("SubPX", $"六、培训费合计:  0.00    元/人");
 
                         //删除多余行
-                        while (table4.Rows.Count > table4Row)
+                        while (table4 != null && table4.Rows.Count > table4Row)
                         {
                             table4.Rows.RemoveAt(table4Row);
                         }
@@ -12123,7 +12116,7 @@ FROM
                         //else dic.Add("SubQT", "七、其他费用合计:  0    元/人");
 
                         //删除多余行
-                        while (table5.Rows.Count > table5Row)
+                        while (table5 != null && table5.Rows.Count > table5Row)
                         {
                             table5.Rows.RemoveAt(table5Row);
                         }

OASystem/OASystem.Api/Middlewares/ExceptionHandlingMiddleware.cs

@@ -106,7 +106,7 @@ namespace OASystem.API.Middlewares
                 // 应用程序异常（业务逻辑错误）：日志Warning
                 ApplicationException appEx => (400, appEx.Message, null, LogLevel.Warning),
                 // 兜底系统异常：隐藏原始消息，日志Critical
-                _ => (500, "服务器内部错误", null, LogLevel.Critical)
+                _ => (500, "服务异常，请稍后重试。", null, LogLevel.Critical)
             };
 
             // ========== 4. 设置HTTP状态码（关键优化） ==========

OASystem/OASystem.Api/Middlewares/RateLimitMiddleware.cs

@@ -236,7 +236,7 @@ namespace OASystem.API.Middlewares
             var response = new JsonView()
             {
                 Code = 429,
-                Msg = $"请求过于频繁（{ruleInfo}），请稍后再试",
+                Msg = $"请求过于频繁（IP：{requestInfo.ClientIp}），请稍后再试！",
                 Count = 0,
                 Data = new
                 {

OASystem/OASystem.Api/Program.cs

@@ -175,7 +175,6 @@ var groups = new List<Tuple<string, string>>
 #region 注入数据库
 builder.Services.AddScoped(options =>
 {
-
     var cpuCount = Environment.ProcessorCount;
     var poolMin = Math.Max(5, cpuCount * 2);
     var poolMax = Math.Max(100, cpuCount * 20);
@@ -226,7 +225,6 @@ builder.Services.AddScoped(options =>
             //获取无参数化SQL 影响性能只适合调试
             //UtilMethods.GetSqlString(DbType.SqlServer, sql, pars);
 
-
             if (pars != null || pars.Length > 0)
             {
                 Console.WriteLine("============== 完整 SQL ==============");

OASystem/OASystem.Api/appsettings.json

@@ -519,14 +519,14 @@
   //限流配置
   "RateLimiting": {
     "Enabled": true,
-    "DefaultLimit": 5,
+    "DefaultLimit": 10,
     "DefaultPeriod": 1,
     "Endpoints": [
       // 所有api接口统一限制：5次/秒
       {
         "Path": "/api/*",
         "Method": "*",
-        "Limit": 5,
+        "Limit": 10,
         "Period": 1,
         "Policy": "IP" //// 0=IP, 1=User, 2=Global, 3=Client
       }