Merge commit 'refs/pull/426/head' of https://gitee.com/zuohuaijun/Admin.NET into next

Admin.NET/Admin.NET.Application/Const/TestConst.cs → Admin.NET/Admin.NET.Application/Const/ApplicationConst.cs

@@ -1,14 +1,17 @@
-namespace Admin.NET.Application.Const;
-
-public class TestConst
-{
-    /// <summary>
-    /// API分组名称
-    /// </summary>
-    public const string GroupName = "我的业务";
-
-    /// <summary>
-    /// 数据库标识
-    /// </summary>
-    public const string ConfigId = "Test";
+namespace Admin.NET.Application.Const;
+
+/// <summary>
+/// 类名说明：辅助代码生成，以项目名.分割的最后一个单词+Const命名
+/// </summary>
+public class ApplicationConst
+{
+    /// <summary>
+    /// API分组名称
+    /// </summary>
+    public const string GroupName = "我的业务";
+
+    /// <summary>
+    /// 数据库标识
+    /// </summary>
+    public const string ConfigId = "Test";
 }

Admin.NET/Admin.NET.Application/Entity/Student.cs

@@ -1,4 +1,4 @@
-using Admin.NET.Application.Const;
+using Admin.NET.Application.Const;
 
 namespace Admin.NET.Application.Entity;
 
@@ -6,7 +6,7 @@ namespace Admin.NET.Application.Entity;
 /// 多库代码生成测试学生表
 /// </summary>
 [SugarTable("d_student", "多库代码生成测试学生表")]
-[Tenant(TestConst.ConfigId)]
+[Tenant(ApplicationConst.ConfigId)]
 public class Student : EntityBase
 {
     /// <summary>

Admin.NET/Admin.NET.Application/Entity/Test.cs

@@ -1,4 +1,4 @@
-using Admin.NET.Application.Const;
+using Admin.NET.Application.Const;
 
 namespace Admin.NET.Application.Entity;
 
@@ -6,7 +6,7 @@ namespace Admin.NET.Application.Entity;
 /// 自己业务数据表
 /// </summary>
 [SugarTable("d_test", "自己业务数据表")]
-[Tenant(TestConst.ConfigId)]
+[Tenant(ApplicationConst.ConfigId)]
 public class Test : EntityBase
 {
     /// <summary>

Admin.NET/Admin.NET.Application/Entity/TreeTest.cs

@@ -1,4 +1,4 @@
-using Admin.NET.Application.Const;
+using Admin.NET.Application.Const;
 
 namespace Admin.NET.Application.Entity;
 
@@ -6,7 +6,7 @@ namespace Admin.NET.Application.Entity;
 /// 多库代码生成树形测试表
 /// </summary>
 [SugarTable("d_treetest", "多库代码生成树形测试表")]
-[Tenant(TestConst.ConfigId)]
+[Tenant(ApplicationConst.ConfigId)]
 public class TreeTest : EntityBase
 {
     /// <summary>

Admin.NET/Admin.NET.Application/Service/Test2Service.cs

@@ -1,4 +1,4 @@
-using Admin.NET.Application.Const;
+using Admin.NET.Application.Const;
 using Magicodes.ExporterAndImporter.Core;
 using Magicodes.ExporterAndImporter.Pdf;
 using Microsoft.AspNetCore.Authorization;
@@ -9,7 +9,7 @@ namespace Admin.NET.Application.Service;
 /// <summary>
 /// 自己业务服务
 /// </summary>
-[ApiDescriptionSettings(TestConst.GroupName, Order = 200)]
+[ApiDescriptionSettings(ApplicationConst.GroupName, Order = 200)]
 [AllowAnonymous]
 public class Test2Service : IDynamicApiController, ITransient
 {

Admin.NET/Admin.NET.Application/Service/TestService.cs

@@ -1,4 +1,4 @@
-using Admin.NET.Application.Const;
+using Admin.NET.Application.Const;
 using Furion.DatabaseAccessor;
 using Furion.FriendlyException;
 using Furion.Localization;
@@ -10,7 +10,7 @@ namespace Admin.NET.Application.Service;
 /// <summary>
 /// 自己业务服务
 /// </summary>
-[ApiDescriptionSettings(TestConst.GroupName, Order = 200)]
+[ApiDescriptionSettings(ApplicationConst.GroupName, Order = 200)]
 [AllowAnonymous]
 public class TestService : IDynamicApiController, ITransient
 {

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

@@ -1,4 +1,4 @@
-namespace Admin.NET.Core.Service;
+namespace Admin.NET.Core.Service;
 
 public class CustomViewEngine : ViewEngineModel
 {
@@ -25,6 +25,8 @@ public class CustomViewEngine : ViewEngineModel
     public string NameSpace { get; set; }
 
     public string ClassName { get; set; }
+    
+    public string ProjectLastName { get; set; }
 
     public string LowerClassName
     {

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

@@ -217,6 +217,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
                 BusName = input.BusName,
                 NameSpace = input.NameSpace,
                 ClassName = input.TableName,
+                ProjectLastName = input.NameSpace.Split('.').Last(),
                 QueryWhetherList = queryWhetherList,
                 TableField = tableFieldList,
                 IsJoinTable = joinTableList.Count > 0,

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm

@@ -5,7 +5,7 @@ namespace @Model.NameSpace;
 /// <summary>
 /// @(@Model.BusName)服务
 /// </summary>
-[ApiDescriptionSettings(TestConst.GroupName, Order = 100)]
+[ApiDescriptionSettings(@(@Model.ProjectLastName)Const.GroupName, Order = 100)]
 public class @(@Model.ClassName)Service : IDynamicApiController, ITransient
 {
     private readonly SqlSugarRepository<@(@Model.ClassName)> _rep;