From 45b3e8965745d9dae5a526b4321a9448bab0649b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Fri, 10 Dec 2021 08:28:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E8=AF=B7=E6=B1=82=E8=B7=AF=E5=BE=84=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=90=8D+=E4=B8=9A=E5=8A=A1=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/CodeGenTemplate/TplControllers.txt     |  2 +-
 .../wwwroot/CodeGenTemplate/TplVueApi.txt          | 14 +++++++-------
 ZR.CodeGenerator/CodeGeneratorTool.cs              |  4 ++--
 ZR.CodeGenerator/FileHelper.cs                     |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
index 91f9590..c4ed803 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
@@ -26,7 +26,7 @@ namespace ${options.ApiControllerNamespace}.Controllers
     /// @date ${replaceDto.AddTime}
     /// </summary>
     [Verify]
-    [Route("${genTable.ModuleName}/${replaceDto.ModelTypeName}")]
+    [Route("${genTable.ModuleName}/${genTable.BusinessName}")]
     public class ${replaceDto.ModelTypeName}Controller : BaseController
     {
         /// <summary>
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
index b6c0fae..b517972 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
@@ -6,7 +6,7 @@
 */
 export function list${genTable.BusinessName}(query) {
   return request({
-    url: '${genTable.ModuleName}/${replaceDto.ModelTypeName}/list',
+    url: '${genTable.ModuleName}/${genTable.BusinessName}/list',
     method: 'get',
     params: query,
   })
@@ -18,7 +18,7 @@ export function list${genTable.BusinessName}(query) {
 */
 export function add${genTable.BusinessName}(data) {
   return request({
-    url: '${genTable.ModuleName}/${replaceDto.ModelTypeName}',
+    url: '${genTable.ModuleName}/${genTable.BusinessName}',
     method: 'post',
     data: data,
   })
@@ -30,7 +30,7 @@ export function add${genTable.BusinessName}(data) {
 */
 export function update${genTable.BusinessName}(data) {
   return request({
-    url: '${genTable.ModuleName}/${replaceDto.ModelTypeName}',
+    url: '${genTable.ModuleName}/${genTable.BusinessName}',
     method: 'PUT',
     data: data,
   })
@@ -42,7 +42,7 @@ export function update${genTable.BusinessName}(data) {
 */
 export function get${genTable.BusinessName}(id) {
   return request({
-    url: '${genTable.ModuleName}/${replaceDto.ModelTypeName}/' + id,
+    url: '${genTable.ModuleName}/${genTable.BusinessName}/' + id,
     method: 'get'
   })
 }
@@ -53,7 +53,7 @@ export function get${genTable.BusinessName}(id) {
 */
 export function del${genTable.BusinessName}(pid) {
   return request({
-    url: '${genTable.ModuleName}/${replaceDto.ModelTypeName}/' + pid,
+    url: '${genTable.ModuleName}/${genTable.BusinessName}/' + pid,
     method: 'delete'
   })
 }
@@ -61,7 +61,7 @@ export function del${genTable.BusinessName}(pid) {
 // 导出${genTable.functionName}
 export function export${genTable.BusinessName}(query) {
   return request({
-    url: '${genTable.ModuleName}/${replaceDto.ModelTypeName}/export',
+    url: '${genTable.ModuleName}/${genTable.BusinessName}/export',
     method: 'get',
     params: query
   })
@@ -71,7 +71,7 @@ $if(genTable.SortField != "" && genTable.SortField != null)
 //排序
 export function changeSort(data) {
   return request({
-    url: '${genTable.ModuleName}/${replaceDto.ModelTypeName}/ChangeSort',
+    url: '${genTable.ModuleName}/${genTable.BusinessName}/ChangeSort',
     method: 'get',
     params: data
   })
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index c17d397..6e5d687 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -11,7 +11,7 @@ using ZR.Model.System.Generate;
 namespace ZR.CodeGenerator
 {
     /// <summary>
-    /// 代码生成器。
+    /// 代码生成器
     /// </remarks>
     /// </summary>
     public class CodeGeneratorTool
@@ -281,7 +281,7 @@ namespace ZR.CodeGenerator
             int nameLength = tableName.Length;
             int subLength = (nameLength - lastIndex) - 1;
             string businessName = tableName[(lastIndex + 1)..];
-            return businessName.Replace("_", "").ToLower();
+            return businessName.Substring(0, 1).ToUpper() + tableName[1..].Replace("_", "");
         }
 
         /// <summary>
diff --git a/ZR.CodeGenerator/FileHelper.cs b/ZR.CodeGenerator/FileHelper.cs
index 13a4ac5..3da7f3b 100644
--- a/ZR.CodeGenerator/FileHelper.cs
+++ b/ZR.CodeGenerator/FileHelper.cs
@@ -187,7 +187,7 @@ namespace ZR.CodeGenerator
             }
             catch (Exception ex) // 异常处理
             {
-                //Log4NetHelper.Error("代码生成异常", ex);
+                Console.WriteLine("代码生成异常" + ex.Message);
             }
         }