优化代码生成

ZR.Admin.WebApi/Controllers/System/ArticleController.cs

@@ -16,7 +16,7 @@ using System;
 namespace ZR.Admin.WebApi.Controllers
 {
     /// <summary>
-    /// T4代码自动生成
+    /// 文章管理
     /// </summary>
     [Verify]
     [Route("article")]

ZR.Admin.WebApi/Extensions/SwaggerExtension.cs

@@ -27,11 +27,16 @@ namespace ZR.Admin.WebApi.Extensions
                     Version = "v1",
                     Description = "",
                 });
-                //if (CurrentEnvironment.IsDevelopment())
+                try
-                //{
+                {
-                //添加文档注释
+                    //添加文档注释
-                c.IncludeXmlComments(Path.Combine(hostEnvironment.ContentRootPath, "ZRAdmin.xml"), true);
+                    c.IncludeXmlComments(Path.Combine(hostEnvironment.ContentRootPath, "ZRAdmin.xml"), true);
-                //}
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine("swagger 文档加载失败" + ex.Message);
+                }
+
                 //参考文章：http://www.zyiz.net/tech/detail-134965.html
                 //需要安装包Swashbuckle.AspNetCore.Filters
                 // 开启权限小锁 需要在对应的Action上添加[Authorize]才能看到

ZR.Admin.WebApi/Startup.cs

@@ -32,7 +32,7 @@ namespace ZR.Admin.WebApi
             Configuration = configuration;
             CurrentEnvironment = hostEnvironment;
         }
-
+        private NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
         private IWebHostEnvironment CurrentEnvironment { get; }
         public IConfiguration Configuration { get; }
         public void ConfigureServices(IServiceCollection services)
@@ -167,13 +167,14 @@ namespace ZR.Admin.WebApi
             });
 
             //调式代码 用来打印SQL 
-            DbScoped.SugarScope.GetConnection("0").Aop.OnLogExecuting = (sql, pars) =>
+            DbScoped.SugarScope.GetConnection(0).Aop.OnLogExecuting = (sql, pars) =>
             {
-                Console.WriteLine("【SQL语句】" + sql.ToLower() + "\r\n"
+                var param = DbScoped.SugarScope.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value));
-                    + DbScoped.SugarScope.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value)));
+                //Console.WriteLine("【SQL语句】" + sql.ToLower() + "\r\n" + param);
+                logger.Info($"Sql语句：{sql}，{param}");
             };
             //出错打印日志
-            DbScoped.SugarScope.GetConnection("0").Aop.OnError = (e) =>
+            DbScoped.SugarScope.GetConnection(0).Aop.OnError = (e) =>
             {
                 Console.WriteLine($"[执行Sql出错]{e.Message}，SQL={e.Sql}");
                 Console.WriteLine();
@@ -182,14 +183,14 @@ namespace ZR.Admin.WebApi
             //调式代码 用来打印SQL 
             DbScoped.SugarScope.GetConnection(1).Aop.OnLogExecuting = (sql, pars) =>
             {
-                Console.WriteLine("【SQL语句Bus】" + sql.ToLower() + "\r\n"
+                var param = DbScoped.SugarScope.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value));
-                    + DbScoped.SugarScope.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value)));
+                //Console.WriteLine("【SQL语句Bus】" + sql.ToLower() + "\r\n" + param);
+                logger.Info($"Sql语句：{sql}, {param}");
             };
             //Bus Db错误日志
             DbScoped.SugarScope.GetConnection(1).Aop.OnError = (e) =>
             {
-                Console.WriteLine($"[执行Sql出错Bus]{e.Message}，SQL={e.Sql}");
+                logger.Error($"执行Sql语句失败：{e.Sql}，原因：{e.Message}");
-                Console.WriteLine();
             };
         }
     }

ZR.Admin.WebApi/ZRAdmin.xml

@@ -36,148 +36,38 @@
             <param name="sheetName"></param>
             <param name="fileName"></param>
         </member>
-        <member name="T:ZR.Admin.WebApi.Controllers.GendemoController">
+        <member name="T:ZR.Admin.WebApi.Controllers.CommonController">
-             <summary>
-             代码生成演示Controller
-            
-             @author zr
-             @date 2021-11-24
-             </summary>
-        </member>
-        <member name="F:ZR.Admin.WebApi.Controllers.GendemoController._GendemoService">
             <summary>
-            代码生成演示接口
+            公共模块
             </summary>
         </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.GendemoController.QueryGendemo(ZR.Model.Dto.GendemoQueryDto)">
+        <member name="M:ZR.Admin.WebApi.Controllers.CommonController.Health">
-            <summary>
-            查询代码生成演示列表
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.GendemoController.GetGendemo(System.Int32)">
-            <summary>
-            查询代码生成演示详情
-            </summary>
-            <param name="Id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.GendemoController.AddGendemo(ZR.Model.Dto.GendemoDto)">
-            <summary>
-            添加代码生成演示
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.GendemoController.UpdateGendemo(ZR.Model.Dto.GendemoDto)">
-            <summary>
-            更新代码生成演示
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.GendemoController.DeleteGendemo(System.String)">
-            <summary>
-            删除代码生成演示
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="T:ZR.Admin.WebApi.Controllers.CodeGeneratorController">
-            <summary>
-            代码生成
-            </summary>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.GetListDataBase">
-            <summary>
-            获取所有数据库的信息
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.FindListTable(System.String,System.String,ZR.Model.PagerInfo)">
-             <summary>
-            获取所有表根据数据名
-             </summary>
-             <param name="dbName">数据库名</param>
-             <param name="tableName">表名</param>
-             <param name="pager">分页信息</param>
-             <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.Generate(ZR.CodeGenerator.Model.GenerateDto)">
-            <summary>
-            代码生成器
-            </summary>
-            <param name="dto">数据传输对象</param>
-            <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.GetGenTable(System.String,ZR.Model.PagerInfo)">
-            <summary>
-            获取代码生成表列表
-            </summary>
-            <param name="tableName">表名</param>
-            <param name="pagerInfo">分页信息</param>
-            <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.GetColumnList(System.Int64)">
-            <summary>
-            查询表字段列表
-            </summary>
-            <param name="tableId">genTable表id</param>
-            <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.Remove(System.String)">
-            <summary>
-            删除代码生成
-            </summary>
-            <param name="tableIds"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.ImportTableSave(System.String,System.String)">
-            <summary>
-            导入表结构（保存）
-            </summary>
-            <param name="tables"></param>
-            <param name="dbName"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.EditSave(ZR.Model.System.Dto.GenTableDto)">
-            <summary>
-            修改保存代码生成业务
-            </summary>
-            <param name="genTableDto">请求参数实体</param>
-            <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.Preview(System.Int64)">
-            <summary>
-            预览代码
-            </summary>
-            <param name="tableId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.HomeController.Health">
             <summary>
             心跳
             </summary>
             <returns></returns>
         </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.HomeController.Encrypt(System.String)">
+        <member name="M:ZR.Admin.WebApi.Controllers.CommonController.SendEmail(Infrastructure.Model.SendEmailDto)">
-            <summary>
-            加密
-            </summary>
-            <param name="content"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.HomeController.Decrypt(System.String)">
-            <summary>
-            解密
-            </summary>
-            <param name="content"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.HomeController.SendEmail(Infrastructure.Model.SendEmailDto)">
             <summary>
             发送邮件
             </summary>
             <param name="sendEmailVo">请求参数接收实体</param>
             <returns></returns>
         </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.CommonController.UploadFile(Microsoft.AspNetCore.Http.IFormFile)">
+            <summary>
+            存储文件
+            </summary>
+            <param name="formFile"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.CommonController.UploadFileAliyun(Microsoft.AspNetCore.Http.IFormFile)">
+            <summary>
+            存储文件到阿里云
+            </summary>
+            <param name="formFile"></param>
+            <returns></returns>
+        </member>
         <member name="T:ZR.Admin.WebApi.Controllers.ArticleController">
             <summary>
             T4代码自动生成
@@ -231,6 +121,77 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="T:ZR.Admin.WebApi.Controllers.CodeGeneratorController">
+            <summary>
+            代码生成
+            </summary>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.GetListDataBase">
+            <summary>
+            获取所有数据库的信息
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.FindListTable(System.String,System.String,ZR.Model.PagerInfo)">
+             <summary>
+            获取所有表根据数据名
+             </summary>
+             <param name="dbName">数据库名</param>
+             <param name="tableName">表名</param>
+             <param name="pager">分页信息</param>
+             <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.GetGenTable(System.String,ZR.Model.PagerInfo)">
+            <summary>
+            获取代码生成表列表
+            </summary>
+            <param name="tableName">表名</param>
+            <param name="pagerInfo">分页信息</param>
+            <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.GetColumnList(System.Int64)">
+            <summary>
+            查询表字段列表
+            </summary>
+            <param name="tableId">genTable表id</param>
+            <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.Remove(System.String)">
+            <summary>
+            删除代码生成
+            </summary>
+            <param name="tableIds"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.ImportTableSave(System.String,System.String)">
+            <summary>
+            导入表结构（保存）
+            </summary>
+            <param name="tables"></param>
+            <param name="dbName"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.EditSave(ZR.Model.System.Dto.GenTableDto)">
+            <summary>
+            修改保存代码生成业务
+            </summary>
+            <param name="genTableDto">请求参数实体</param>
+            <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.Preview(System.Int64)">
+            <summary>
+            预览代码
+            </summary>
+            <param name="tableId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.Generate(ZR.CodeGenerator.Model.GenerateDto)">
+            <summary>
+            生成代码（下载方式）
+            </summary>
+            <param name="dto">数据传输对象</param>
+            <returns></returns>
+        </member>
         <member name="M:ZR.Admin.WebApi.Controllers.monitor.MonitorController.GetCache">
             <summary>
             获取缓存监控数据
@@ -663,6 +624,7 @@
             <summary>
             修改头像
             </summary>
+            <param name="formFile"></param>
             <returns></returns>
         </member>
         <member name="T:ZR.Admin.WebApi.Controllers.System.SysRoleController">
@@ -894,13 +856,6 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.UploadController.SaveFile(Microsoft.AspNetCore.Http.IFormFile)">
-            <summary>
-            存储文件
-            </summary>
-            <param name="formFile"></param>
-            <returns></returns>
-        </member>
         <member name="T:ZR.Admin.WebApi.Extensions.HttpContextExtension">
             <summary>
             HttpContext扩展类
@@ -920,6 +875,13 @@
             <param name="context"></param>
             <returns></returns>
         </member>
+        <member name="M:ZR.Admin.WebApi.Extensions.HttpContextExtension.GetClaims(Microsoft.AspNetCore.Http.HttpContext)">
+            <summary>
+            ClaimsIdentity
+            </summary>
+            <param name="context"></param>
+            <returns></returns>
+        </member>
         <member name="M:ZR.Admin.WebApi.Extensions.HttpContextExtension.GetToken(Microsoft.AspNetCore.Http.HttpContext)">
             <summary>
             获取请求令牌
@@ -927,13 +889,13 @@
             <param name="context"></param>
             <returns></returns>
         </member>
-        <member name="M:ZR.Admin.WebApi.Extensions.HttpContextExtension.WriteCookies(Microsoft.AspNetCore.Http.HttpContext,ZR.Model.System.LoginUser)">
+        <member name="M:ZR.Admin.WebApi.Extensions.HttpContextExtension.AddClaims(Microsoft.AspNetCore.Http.HttpContext,ZR.Model.System.LoginUser)">
-            <summary>
+             <summary>
-            登录cookie写入
+            组装Claims
-            </summary>
+             </summary>
-            <param name="context"></param>
+             <param name="context"></param>
-            <param name="user"></param>
+             <param name="user"></param>
-            <returns></returns>
+             <returns></returns>
         </member>
         <member name="T:ZR.Admin.WebApi.Extensions.TasksExtension">
             <summary>
@@ -1036,6 +998,12 @@
             <param name="claims"></param>
             <returns></returns>
         </member>
+        <member name="M:ZR.Admin.WebApi.Framework.JwtUtil.ValidParameters">
+            <summary>
+            验证Token
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:ZR.Admin.WebApi.Framework.JwtUtil.ParseToken(System.String)">
             <summary>
             从令牌中获取数据声明
@@ -1051,7 +1019,7 @@
             <returns></returns>
         </member>
         <!-- Badly formed XML comment ignored for member "T:ZR.Admin.WebApi.Middleware.GlobalExceptionMiddleware" -->
-        <member name="M:ZR.Admin.WebApi.Startup.InjectRepositories(Microsoft.Extensions.DependencyInjection.IServiceCollection)">
+        <member name="M:ZR.Admin.WebApi.Startup.InjectServices(Microsoft.Extensions.DependencyInjection.IServiceCollection)">
             <summary>
             注册Services服务
             </summary>

ZR.Admin.WebApi/appsettings.json

@@ -15,7 +15,7 @@
   "urls": "http://localhost:8888", //项目启动url
   "sysConfig": {
     "DBCommandTimeout": 10,
-    "cors": "http://localhost:8887" //跨域地址，多个用","隔开
+    "cors": "http://localhost:8887" //跨域地址（前端启动项目），多个用","隔开
   },
   "JwtSettings": {
     "Issuer": "https://localhost:8888",

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt

@@ -160,25 +160,23 @@ ${end}
             string sFileName = ExportExcel(list, "${replaceDto.ModelTypeName}", "${genTable.FunctionName}");
             return SUCCESS(new { path = "/export/" + sFileName, fileName = sFileName });
         }
-
 $if(genTable.SortField != "")
-        /// <summary>
+        ////// <summary>
-        /// 保存排序
+        ////// 代码自动生成（不用可删除） 保存排序
-        /// </summary>
+        ////// </summary>
-        /// <param name="id"></param>
+        ////// <param name="id"></param>
-        /// <param name="orderNum"></param>
+        ////// <param name="orderNum"></param>
-        /// <returns></returns>
+        ////// <returns></returns>
-        [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:update")]
+        ///[ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:update")]
-        [HttpGet("ChangeSort")]
+        ///[HttpGet("ChangeSort")]
-        [Log(Title = "保存排序", BusinessType = BusinessType.UPDATE)]
+        //[Log(Title = "保存排序", BusinessType = BusinessType.UPDATE)]
-        public IActionResult ChangeSort(int id = 0, int orderNum = 0)
+        //public IActionResult ChangeSort(int id = 0, int orderNum = 0)
-        {
+        //{
-            if (id <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
+        //    if (id <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
-
+        //    bool result = _${replaceDto.ModelTypeName}Service.Update(w => w.${replaceDto.PKName} == id, it => new ${replaceDto.ModelTypeName}() { ${genTable.SortField} = orderNum });;
-            bool result = _${replaceDto.ModelTypeName}Service.Update(w => w.${replaceDto.PKName} == id, it => new ${replaceDto.ModelTypeName}() { ${genTable.SortField} = orderNum });;
             
-            return SUCCESS(result);
+        //    return SUCCESS(result);
-        }
+        //}
 $end
     }
 }

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt

@@ -20,7 +20,7 @@ ${vueQueryFormHtml}
       <el-col :span="1.5">
         <el-button type="danger" :disabled="multiple" v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" plain icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
       </el-col>
-$if(genTable.SortField != "")
+$if(genTable.SortField != "" && 1 == 2)
       <el-col :span="1.5">
         <el-button type="info" plain icon="el-icon-edit" size="mini" @click="handleShowSort" v-hasPermi="['${replaceDto.PermissionPrefix}:update']">修改排序</el-button>
       </el-col>

ZR.Vue/src/views/tool/gen/genInfoForm.vue

@@ -75,7 +75,7 @@
       <el-col :span="12">
         <el-form-item>
           <span slot="label">
-            排序字段
+            查询排序字段
           </span>
 
           <el-select v-model="info.sortField" placeholder="请选择字段" class="mr10" clearable="">