Merge branch 'next' of https://gitee.com/zuohuaijun/Admin.NET into next

Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -418,7 +418,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
             PrintName = input.PrintName,
             AuthorName = input.AuthorName,
             ProjectLastName = input.NameSpace!.Split('.').Last(),
-            LowerClassName = input.TableName![..1].ToLower() + input.TableName[1..],
+            LowerClassName = input.TableName!.ToFirstLetterLowerCase(),
             TableUniqueConfigList = input.TableUniqueList ?? new(),
 
             TableField = tableFieldList,
@@ -479,7 +479,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         await DeleteMenuTree(title, pid == 0 ? MenuTypeEnum.Dir : MenuTypeEnum.Menu);
 
         var parentMenuPath = "";
-        var lowerClassName = className[..1].ToLower() + className[1..];
+        var lowerClassName = className!.ToFirstLetterLowerCase();
         if (pid == 0)
         {
             // 新增目录，并记录Id
@@ -610,6 +610,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     {
         var zipPath = Path.Combine(App.WebHostEnvironment.WebRootPath, "CodeGen", input.TableName!);
 
+        var firstLowerTableName = input.TableName!.ToFirstLetterLowerCase();
         //var backendPath = Path.Combine(zipPath, _codeGenOptions.BackendApplicationNamespace, "Service", input.TableName);
         var backendPath = Path.Combine(zipPath, input.NameSpace!, "Service", input.TableName);
         var servicePath = Path.Combine(backendPath, input.TableName + "Service.cs");
@@ -617,9 +618,9 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         var outputPath = Path.Combine(backendPath, "Dto", input.TableName + "Output.cs");
         var viewPath = Path.Combine(backendPath, "Dto", input.TableName + "Dto.cs");
         var frontendPath = Path.Combine(zipPath, _codeGenOptions.FrontRootPath, "src", "views", input.PagePath!);
-        var indexPath = Path.Combine(frontendPath, input.TableName[..1].ToLower() + input.TableName[1..], "index.vue");
-        var formModalPath = Path.Combine(frontendPath, input.TableName[..1].ToLower() + input.TableName[1..], "component", "editDialog.vue");
-        var apiJsPath = Path.Combine(zipPath, _codeGenOptions.FrontRootPath, "src", "api", input.PagePath, input.TableName[..1].ToLower() + input.TableName[1..] + ".ts");
+        var indexPath = Path.Combine(frontendPath, firstLowerTableName, "index.vue");
+        var formModalPath = Path.Combine(frontendPath, firstLowerTableName, "component", "editDialog.vue");
+        var apiJsPath = Path.Combine(zipPath, _codeGenOptions.FrontRootPath, "src", "api", input.PagePath, firstLowerTableName + ".ts");
         if (input.GenerateType!.StartsWith("11"))
         {
             return new List<string>

Admin.NET/Admin.NET.Core/Utils/AdminResultProvider.cs

@@ -97,11 +97,32 @@ public class AdminResultProvider : IUnifyResultProvider
                         App.GetOptions<JsonOptions>()?.JsonSerializerOptions);
                 }
                 break;
-
-            default: break;
         }
     }
 
+    /// <summary>
+    /// 返回成功结果集
+    /// </summary>
+    /// <param name="message"></param>
+    /// <param name="data"></param>
+    /// <returns></returns>
+    public static AdminResult<object> Ok(string message, object data = default)
+    {
+        return RESTfulResult(StatusCodes.Status200OK, true, data, message);
+    }
+
+    /// <summary>
+    /// 返回失败结果集
+    /// </summary>
+    /// <param name="message"></param>
+    /// <param name="code"></param>
+    /// <param name="data"></param>
+    /// <returns></returns>
+    public static AdminResult<object> Error(string message, int code = StatusCodes.Status400BadRequest, object data = default)
+    {
+        return RESTfulResult(code, false, data, message);
+    }
+
     /// <summary>
     /// 返回 RESTful 风格结果集
     /// </summary>
@@ -132,45 +153,6 @@ public class AdminResultProvider : IUnifyResultProvider
             Time = DateTime.Now
         };
     }
-
-    /// <summary>
-    /// 返回成功结果集
-    /// </summary>
-    /// <param name="message"></param>
-    /// <param name="data"></param>
-    /// <returns></returns>
-    public static AdminResult<object> Ok(string message, object data = default)
-    {
-        return new AdminResult<object>
-        {
-            Code = StatusCodes.Status200OK,
-            Message = message,
-            Result = data,
-            Type = "success",
-            Extras = UnifyContext.Take(),
-            Time = DateTime.Now
-        };
-    }
-
-    /// <summary>
-    /// 返回失败结果集
-    /// </summary>
-    /// <param name="message"></param>
-    /// <param name="code"></param>
-    /// <param name="data"></param>
-    /// <returns></returns>
-    public static AdminResult<object> Error(string message, int code = StatusCodes.Status400BadRequest, object data = default)
-    {
-        return new AdminResult<object>
-        {
-            Code = code,
-            Message = message,
-            Result = data,
-            Type = "error",
-            Extras = UnifyContext.Take(),
-            Time = DateTime.Now
-        };
-    }
 }
 
 /// <summary>

Admin.NET/Admin.NET.Core/Utils/ExcelHelper.cs

@@ -51,15 +51,7 @@ public class ExcelHelper
         catch (Exception ex)
         {
             App.HttpContext.Response.Headers["Content-Type"] = "application/json; charset=utf-8";
-            throw Oops.Oh(new AdminResult<object>
-            {
-                Code = 500,
-                Message = ex.Message,
-                Result = null,
-                Type = "error",
-                Extras = UnifyContext.Take(),
-                Time = DateTime.Now
-            }.ToJson());
+            throw Oops.Oh(AdminResultProvider.Error(ex.Message, 500).ToJson());
         }
     }