From 9ff6fb8c9800bcc185b67473aed4c373563b33d6 Mon Sep 17 00:00:00 2001
From: izory <791736813@qq.com>
Date: Thu, 9 Sep 2021 18:18:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/CodeGeneratorController.cs    |  42 ++-
 .../Template/ControllersTemplate.txt          |  14 +-
 ZR.Admin.WebApi/Template/VueTemplate.txt      |   9 +-
 ZR.CodeGenerator/CodeGeneratorTool.cs         | 331 ++++++++++--------
 ZR.CodeGenerator/Model/GenerateDto.cs         |  34 ++
 .../Service/CodeGeneraterService.cs           |  11 +-
 ZR.Model/CodeGenerator/DataBaseInfo.cs        |  14 -
 ZR.Repository/ZR.Repository.csproj            |   4 +
 ZR.Service/IService/ICodeGeneratorService.cs  |  23 --
 ZR.Service/ZR.Service.csproj                  |   1 +
 ZR.Vue/document/t4.tt                         |   0
 ZR.Vue/document/template.vue                  |  71 ++--
 ZR.Vue/src/api/tool/gen.js                    |  30 +-
 ZR.Vue/src/views/demo.vue                     | 198 +++++------
 ZR.Vue/src/views/tool/index.vue               | 256 +++++++-------
 ZRAdmin.xml                                   |  15 +-
 16 files changed, 557 insertions(+), 496 deletions(-)
 create mode 100644 ZR.CodeGenerator/Model/GenerateDto.cs
 delete mode 100644 ZR.Model/CodeGenerator/DataBaseInfo.cs
 delete mode 100644 ZR.Service/IService/ICodeGeneratorService.cs
 delete mode 100644 ZR.Vue/document/t4.tt

diff --git a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs
index 92bd1f5..49cb10b 100644
--- a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs
+++ b/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs
@@ -9,9 +9,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using ZR.CodeGenerator;
+using ZR.CodeGenerator.Model;
 using ZR.CodeGenerator.Service;
 using ZR.Model;
-using ZR.Model.CodeGenerator;
 using ZR.Model.Vo;
 using ZR.Service.IService;
 using ZR.Service.System;
@@ -21,7 +21,7 @@ namespace ZR.Admin.WebApi.Controllers
     /// <summary>
     /// 代码生成
     /// </summary>
-    [Route("codeGenerator")]
+    [Route("tool/gen")]
     public class CodeGeneratorController : BaseController
     {
         //public ICodeGeneratorService CodeGeneratorService;
@@ -35,11 +35,13 @@ namespace ZR.Admin.WebApi.Controllers
         /// 获取所有数据库的信息
         /// </summary>
         /// <returns></returns>
-        [HttpGet("GetListDataBase")]
+        [HttpGet("getDbList")]
         //[YuebonAuthorize("GetListDataBase")]
         public IActionResult GetListDataBase()
         {
-            return SUCCESS(_CodeGeneraterService.GetAllDataBases());
+            var dbList = _CodeGeneraterService.GetAllDataBases();
+            var defaultDb = dbList.Count > 0 ? dbList[0] : null;
+            return SUCCESS(new { dbList, defaultDb });
         }
 
         /// <summary>
@@ -59,27 +61,35 @@ namespace ZR.Admin.WebApi.Controllers
         }
 
         /// <summary>
-        /// 代码生成器
+        /// 获取表格列
         /// </summary>
         /// <param name="dbName"></param>
-        /// <param name="tables">要生成代码的表</param>
-        /// <param name="baseSpace">项目命名空间</param>
-        /// <param name="replaceTableNameStr">要删除表名的字符串用英文逗号","隔开</param>
+        /// <param name="tableName"></param>
+        /// <returns></returns>
+        [HttpGet("QueryColumnInfo")]
+        public IActionResult QueryColumnInfo(string dbName, string tableName)
+        {
+            if (string.IsNullOrEmpty(dbName) || string.IsNullOrEmpty(tableName))
+                return ToRespose(ResultCode.PARAM_ERROR);
+
+            return SUCCESS(_CodeGeneraterService.GetColumnInfo(dbName, tableName));
+        }
+
+        /// <summary>
+        /// 代码生成器
+        /// </summary>
+        /// <param name="dto">数据传输对象</param>
         /// <returns></returns>
         [HttpGet("Generate")]
         [Log(Title = "代码生成", BusinessType = BusinessType.OTHER)]
-        public IActionResult Generate(string dbName, string baseSpace, string tables, string replaceTableNameStr)
+        public IActionResult Generate([FromQuery] GenerateDto dto)
         {
-            if (string.IsNullOrEmpty(tables))
+            if (string.IsNullOrEmpty(dto.tables))
             {
                 throw new CustomException(ResultCode.CUSTOM_ERROR, "请求参数为空");
             }
-            if (string.IsNullOrEmpty(baseSpace))
-            {
-                baseSpace = "ZR.Admin";
-            }
-            DbTableInfo dbTableInfo = new() { Name = tables };
-            CodeGeneratorTool.Generate(dbName, baseSpace, dbTableInfo, replaceTableNameStr, true);
+            DbTableInfo dbTableInfo = new() { Name = dto.tables };
+            CodeGeneratorTool.Generate(dbTableInfo, dto);
 
             return SUCCESS(1);
         }
diff --git a/ZR.Admin.WebApi/Template/ControllersTemplate.txt b/ZR.Admin.WebApi/Template/ControllersTemplate.txt
index 6ff88ef..2031f4e 100644
--- a/ZR.Admin.WebApi/Template/ControllersTemplate.txt
+++ b/ZR.Admin.WebApi/Template/ControllersTemplate.txt
@@ -17,7 +17,7 @@ using ZR.Model;
 namespace ZRAdmin.Controllers
 {
     /// <summary>
-    /// T4代码自动生成
+    /// 代码自动生成
     /// </summary>
 	
     [Verify]
@@ -39,7 +39,7 @@ namespace ZRAdmin.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet("list")]
-        [ActionPermissionFilter(Permission = "<#=ModelName#>:list")]
+        [ActionPermissionFilter(Permission = "<#=Permission#>:list")]
         public IActionResult Query([FromQuery] <#=ModelName#>QueryDto parm)
         {
             //开始拼装查询条件
@@ -59,7 +59,7 @@ namespace ZRAdmin.Controllers
         /// <param name="{primaryKey}"></param>
         /// <returns></returns>
         [HttpGet("{{primaryKey}}")]
-        public IActionResult Get(int {primaryKey})
+        public IActionResult Get({KeyTypeName} {primaryKey})
         {
             var response = _<#=ServiceName#>.GetId({primaryKey});
 
@@ -71,7 +71,7 @@ namespace ZRAdmin.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [ActionPermissionFilter(Permission = "<#=ModelName#>:add")]
+        [ActionPermissionFilter(Permission = "<#=Permission#>:add")]
         [Log(Title = "<#=FileName#>添加", BusinessType = BusinessType.INSERT)]
         public IActionResult Create([FromBody] <#=ModelName#>Dto parm)
         {
@@ -91,7 +91,7 @@ namespace ZRAdmin.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPut("edit")]
-        [ActionPermissionFilter(Permission = "<#=ModelName#>:update")]
+        [ActionPermissionFilter(Permission = "<#=Permission#>:update")]
         [Log(Title = "<#=FileName#>修改", BusinessType = BusinessType.UPDATE)]
         public IActionResult Update([FromBody] <#=ModelName#>Dto parm)
         {
@@ -109,9 +109,9 @@ namespace ZRAdmin.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpDelete("{{primaryKey}}")]
-        [ActionPermissionFilter(Permission = "<#=ModelName#>:delete")]
+        [ActionPermissionFilter(Permission = "<#=Permission#>:delete")]
         [Log(Title = "<#=FileName#>删除", BusinessType = BusinessType.DELETE)]
-        public IActionResult Delete(int {primaryKey} = 0)
+        public IActionResult Delete({KeyTypeName} {primaryKey} = 0)
         {
             if ({primaryKey} <= 0) { return OutputJson(ApiResult.Error($"删除失败Id 不能为空")); }
 
diff --git a/ZR.Admin.WebApi/Template/VueTemplate.txt b/ZR.Admin.WebApi/Template/VueTemplate.txt
index 7a2717e..b8e7b95 100644
--- a/ZR.Admin.WebApi/Template/VueTemplate.txt
+++ b/ZR.Admin.WebApi/Template/VueTemplate.txt
@@ -62,7 +62,7 @@
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">详情</el-button>
           <el-button size="mini"  v-hasPermi="['{ModelTypeName}:update']" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">编辑</el-button>
           <el-popconfirm title="确定删除吗？" @onConfirm="handleDelete(scope.row)" style="margin-left:10px">
-            <el-button slot="reference"  v-hasPermi="['{ModelTypeName}:del']" size="mini" type="text" icon="el-icon-delete">删除</el-button>
+            <el-button slot="reference"  v-hasPermi="['{ModelTypeName}:delete']" size="mini" type="text" icon="el-icon-delete">删除</el-button>
           </el-popconfirm>
         </template>
       </el-table-column>
@@ -83,7 +83,7 @@
   </div>
 </template>
 <script>
-// import { list{ModelTypeName},add{ModelTypeName},del{ModelTypeName},edit{ModelTypeName} } from '@/api/{ModelTypeName}.js'
+import { list{ModelTypeName},add{ModelTypeName},del{ModelTypeName},edit{ModelTypeName} } from '@{ModelTypeName}.js'
 
 export default {
   name: '{ModelTypeName}',
@@ -197,10 +197,7 @@ export default {
 
       // TODO 给表单赋值
       this.form = {
-        content: row.content,
-        userId: row.userId,
-        name: row.name,
-        sortId: row.sortId,
+        {VueViewEditFromBindContent}
       };
     },
     /** 提交按钮 */
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index c284334..9c51eb8 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -1,14 +1,12 @@
 using SqlSugar;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using ZR.CodeGenerator.CodeGenerator;
+using ZR.CodeGenerator.Model;
 using ZR.CodeGenerator.Service;
-using ZR.Model;
 
 namespace ZR.CodeGenerator
 {
@@ -27,72 +25,55 @@ namespace ZR.CodeGenerator
         /// <summary>
         /// InputDto输入实体是不包含字段
         /// </summary>
-        private static string inputDtoNoField = "DeleteMark,CreatorTime,CreatorUserId,CompanyId,DeptId,LastModifyTime,LastModifyUserId,DeleteTime,DeleteUserId,";
+        private static string[] inputDtoNoField = new string[] { "DeleteMark", "CreateTime", "updateTime", "addtime" };
+        private static string[] imageFiled = new string[] { "icon", "img", "image", "url", "pic" };
+        private static string[] selectFiled = new string[] { "status", "type", "state" };
+        private static string[] radioFiled = new string[] { "status", "state", "is" };
 
         /// <summary>
         /// 代码生成器入口方法
         /// </summary>
-        /// <param name="baseNamespace"></param>
         /// <param name="dbTableInfo"></param>
-        /// <param name="replaceTableNameStr">要删除表名称的字符</param>
-        /// <param name="ifExsitedCovered">是否替换现有文件，为true时替换</param>
-        public static void Generate(string dbName, string baseNamespace, DbTableInfo dbTableInfo, string replaceTableNameStr, bool ifExsitedCovered = false)
+        /// <param name="dto"></param>
+        public static void Generate(DbTableInfo dbTableInfo, GenerateDto dto)
         {
-            _option.BaseNamespace = baseNamespace;
-            _option.DtosNamespace = baseNamespace + "ZR.Model";
-            _option.ModelsNamespace = baseNamespace + "ZR.Model";
-            //_option.IRepositoriesNamespace = baseNamespace + ".IRepositorie";
-            _option.RepositoriesNamespace = baseNamespace + "ZR.Repository";
-            _option.IServicsNamespace = baseNamespace + "ZR.Service";
-            _option.ServicesNamespace = baseNamespace + "ZR.Service";
-            _option.ApiControllerNamespace = baseNamespace + "ZR.Admin.WebApi";
-            _option.ReplaceTableNameStr = replaceTableNameStr;
+            //_option.BaseNamespace = baseNamespace;
+            _option.DtosNamespace = "ZR.Model";
+            _option.ModelsNamespace = "ZR.Model";
+            _option.RepositoriesNamespace = "ZR.Repository";
+            _option.IServicsNamespace = "ZR.Service";
+            _option.ServicesNamespace = "ZR.Service";
+            _option.ApiControllerNamespace = "ZR.Admin.WebApi";
+            _option.ReplaceTableNameStr = dto.replaceTableNameStr;
             //_option.TableList = listTable;
 
             CodeGeneraterService codeGeneraterService = new CodeGeneraterService();
-            string profileContent = string.Empty;
-            List<DbColumnInfo> listField = codeGeneraterService.GetColumnInfo(dbName, dbTableInfo.Name);
-            GenerateSingle(listField, dbTableInfo, ifExsitedCovered);
-            //string tableName = dbTableInfo.TableName;
-            //if (!string.IsNullOrEmpty(_option.ReplaceTableNameStr))
-            //{
-            //    string[] rel = _option.ReplaceTableNameStr.Split(';');
-            //    for (int i = 0; i < rel.Length; i++)
-            //    {
-            //        if (!string.IsNullOrEmpty(rel[i].ToString()))
-            //        {
-            //            tableName = tableName.Replace(rel[i].ToString(), "");
-            //        }
-            //    }
-            //}
-            //tableName = tableName.Substring(0, 1).ToUpper() + tableName.Substring(1);
-            //profileContent += string.Format("           CreateMap<{0}, {0}OutputDto>();\n", tableName);
-            //profileContent += string.Format("           CreateMap<{0}InputDto, {0}>();\n", tableName);
+
+            List<DbColumnInfo> listField = codeGeneraterService.GetColumnInfo(dto.dbName, dbTableInfo.Name);
+            GenerateSingle(listField, dbTableInfo, dto);
 
             //GenerateDtoProfile(_option.ModelsNamespace, profileContent, ifExsitedCovered);
         }
 
-
-
         /// <summary>
         /// 单表生成代码
         /// </summary>
         /// <param name="listField">表字段集合</param>
         /// <param name="tableInfo">表信息</param>
         /// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param>
-        public static void GenerateSingle(List<DbColumnInfo> listField, DbTableInfo tableInfo, bool ifExsitedCovered = false)
+        public static void GenerateSingle(List<DbColumnInfo> listField, DbTableInfo tableInfo, GenerateDto dto)
         {
-            var modelsNamespace = _option.ModelsNamespace;
-            var modelTypeName = GetModelName(tableInfo.Name); ;//表名
+            bool ifExsitedCovered = dto.coverd;
+            var modelTypeName = GetModelName(tableInfo.Name).Replace(_option.ReplaceTableNameStr, "");//表名
             var modelTypeDesc = tableInfo.Description;//表描述
             var primaryKey = "id";//主键
 
             string keyTypeName = "int";//主键数据类型
-            string modelcontent = "";//数据库模型字段
-            string InputDtocontent = "";//输入模型
-            string outputDtocontent = "";//输出模型
+            string modelContent = "";//数据库模型字段
+            string InputDtoContent = "";//输入模型
+            string outputDtoContent = "";//输出模型
             string vueViewListContent = string.Empty;//Vue列表输出内容
-            string vueViewFromContent = string.Empty;//Vue表单输出内容 
+            string vueViewFormContent = string.Empty;//Vue表单输出内容 
             string vueViewEditFromContent = string.Empty;//Vue变量输出内容
             string vueViewEditFromBindContent = string.Empty;//Vue显示初始化输出内容
             string vueViewSaveBindContent = string.Empty;//Vue保存时输出内容
@@ -100,55 +81,81 @@ namespace ZR.CodeGenerator
 
             foreach (DbColumnInfo dbFieldInfo in listField)
             {
-                string columnName = dbFieldInfo.DbColumnName.Substring(0, 1).ToUpper() + dbFieldInfo.DbColumnName.Substring(1);
-
-                modelcontent = GetModelTemplate(ref primaryKey, dbFieldInfo, columnName);
+                string columnName = FirstLowerCase(dbFieldInfo.DbColumnName);
 
                 if (dbFieldInfo.DataType == "bool" || dbFieldInfo.DataType == "tinyint")
                 {
-                    vueViewEditFromContent += string.Format("        {0}: 'true',\n", columnName);
-                    vueViewEditFromBindContent += string.Format("        this.editFrom.{0} = res.data.{0}+''\n", columnName);
+                    vueViewEditFromContent += $"        {columnName}: 'true',\n";
+                    vueViewEditFromBindContent += $"        this.form.{columnName} = res.data.{0}+''\n";
                 }
                 else
                 {
-                    vueViewEditFromContent += string.Format("        {0}: '',\n", columnName);
-                    vueViewEditFromBindContent += string.Format("        this.editFrom.{0} = res.ResData.{0}\n", columnName);
+                    vueViewEditFromContent += $"        {columnName}: undefined,\n";
+                    vueViewEditFromBindContent += $"        {columnName} = row.{columnName}\n";
                 }
                 //vueViewSaveBindContent += string.Format("        '{0}':this.editFrom.{0},\n", columnName);
-                vueViewFromContent += GetVueViewFromContent(dbFieldInfo, columnName);
-                vueViewListContent += GetTableColumn(dbFieldInfo, columnName);
-                //Rule 规则验证
-                if (!dbFieldInfo.IsNullable)
+                if (dbFieldInfo.IsIdentity || dbFieldInfo.IsPrimarykey)
                 {
-                    vueViewEditFromRuleContent += $"        {columnName}: [\n";
-                    vueViewEditFromRuleContent += $"        {{ required: true, message:\"请输入{dbFieldInfo.ColumnDescription}\", trigger: \"blur\"}},\n";
-                    //vueViewEditFromRuleContent += "        { min: 2, max: 50, message: \"长度在 2 到 50 个字符\", trigger:\"blur\" }\n";
-                    vueViewEditFromRuleContent += "        ],\n";
+                    primaryKey = columnName;
+                    keyTypeName = dbFieldInfo.DataType;
                 }
-
-                //if (!inputDtoNoField.Contains(columnName) || columnName == "Id")
-                //{
-                InputDtocontent += "        /// <summary>\n";
-                InputDtocontent += $"       /// 设置或获取{dbFieldInfo.ColumnDescription}\n";
-                InputDtocontent += "        /// </summary>\n";
-                InputDtocontent += $"        public {TableMappingHelper.GetPropertyDatatype(dbFieldInfo.DataType)} {columnName} {{ get; set; }}\n\r";
-                //}
-                //
+                modelContent += GetModelTemplate(dbFieldInfo);
+                vueViewFormContent += GetVueViewFormContent(dbFieldInfo, columnName);
+                vueViewListContent += GetTableColumn(dbFieldInfo, columnName);
+                vueViewEditFromRuleContent += GetFormRules(dbFieldInfo, columnName);
+                InputDtoContent += GetDtoContent(dbFieldInfo, columnName);
+            }
+            if (dto.genFiles.Contains(1))
+            {
+                GenerateModels(_option.ModelsNamespace, modelTypeName, tableInfo.Name, modelContent, modelTypeDesc, keyTypeName, ifExsitedCovered);
+            }
+            if (dto.genFiles.Contains(2))
+            {
+                GenerateInputDto(_option.ModelsNamespace, modelTypeName, modelTypeDesc, InputDtoContent, keyTypeName, ifExsitedCovered);
+            }
+            if (dto.genFiles.Contains(3))
+            {
+                GenerateRepository(modelTypeName, modelTypeDesc, tableInfo.Name, keyTypeName, ifExsitedCovered);
+            }
+            if (dto.genFiles.Contains(4))
+            {
+                GenerateIService(_option.ModelsNamespace, modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered);
+                GenerateService(_option.ModelsNamespace, modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered);
+            }
+            if (dto.genFiles.Contains(5))
+            {
+                GenerateControllers(modelTypeName, primaryKey, modelTypeDesc, keyTypeName, ifExsitedCovered);
+            }
+            if (dto.genFiles.Contains(6))
+            {
+                GenerateVueViews(modelTypeName, primaryKey, modelTypeDesc, vueViewListContent, vueViewFormContent, vueViewEditFromContent, vueViewEditFromBindContent, vueViewSaveBindContent, vueViewEditFromRuleContent, ifExsitedCovered);
             }
-            //GenerateModels(modelsNamespace, modelTypeName, tableInfo.Name, modelcontent, modelTypeDesc, keyTypeName, ifExsitedCovered);
-            //GenerateInputDto(modelsNamespace, modelTypeName, modelTypeDesc, InputDtocontent, keyTypeName, ifExsitedCovered);
-            //GenerateRepository(modelTypeName, modelTypeDesc, tableInfo.Name, keyTypeName, ifExsitedCovered);
-            //GenerateIService(modelsNamespace, modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered);
-            //GenerateService(modelsNamespace, modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered);
-            //GenerateControllers(modelTypeName, primaryKey, modelTypeDesc, keyTypeName, ifExsitedCovered);
-
             //GenerateIRepository(modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered);
             //GenerateOutputDto(modelTypeName, modelTypeDesc, outputDtocontent, ifExsitedCovered);
-            GenerateVueViews(modelTypeName, primaryKey, modelTypeDesc, vueViewListContent, vueViewFromContent, vueViewEditFromContent, vueViewEditFromBindContent, vueViewSaveBindContent, vueViewEditFromRuleContent, ifExsitedCovered);
         }
 
-        private static string GetModelTemplate(ref string primaryKey, DbColumnInfo dbFieldInfo, string columnName)
+        #region Template
+
+        //rules
+        private static string GetFormRules(DbColumnInfo dbFieldInfo, string columnName)
         {
+            string vueViewEditFromRuleContent = "";
+            //Rule 规则验证
+            if (!dbFieldInfo.IsNullable && !dbFieldInfo.IsIdentity)
+            {
+                vueViewEditFromRuleContent += $"        {columnName}: [\n";
+                vueViewEditFromRuleContent += $"        {{ required: true, message:\"请输入{dbFieldInfo.ColumnDescription}\", trigger: \"blur\"}},\n";
+                //vueViewEditFromRuleContent += "        { min: 2, max: 50, message: \"长度在 2 到 50 个字符\", trigger:\"blur\" }\n";
+                vueViewEditFromRuleContent += "        ],\n";
+            }
+
+            return vueViewEditFromRuleContent;
+        }
+
+        //model 属性
+        private static string GetModelTemplate(DbColumnInfo dbFieldInfo)
+        {
+            string columnName = dbFieldInfo.DbColumnName.Substring(0, 1).ToUpper() + dbFieldInfo.DbColumnName.Substring(1);
             var modelcontent = "";
             modelcontent += "        /// <summary>\n";
             modelcontent += $"        /// 描述 :{dbFieldInfo.ColumnDescription}\n";
@@ -157,43 +164,57 @@ namespace ZR.CodeGenerator
             modelcontent += "        /// </summary>\n";
             if (dbFieldInfo.IsIdentity || dbFieldInfo.IsPrimarykey)
             {
-                primaryKey = columnName;
                 modelcontent += $"        [SqlSugar.SugarColumn(IsPrimaryKey = {dbFieldInfo.IsPrimarykey.ToString().ToLower()}, IsIdentity = {dbFieldInfo.IsIdentity.ToString().ToLower()})]\n";
             }
             modelcontent += $"        public {TableMappingHelper.GetPropertyDatatype(dbFieldInfo.DataType)} {columnName} {{ get; set; }}\n\r";
             return modelcontent;
         }
-        //
-        //form-item
-        private static string GetVueViewFromContent(DbColumnInfo dbFieldInfo, string columnName)
+        //DTO model
+        private static string GetDtoContent(DbColumnInfo dbFieldInfo, string columnName)
         {
+            string InputDtoContent = "";
+            if (!inputDtoNoField.Any(x => x.ToLower().Contains(columnName)) || !dbFieldInfo.IsIdentity)
+            {
+                InputDtoContent += "        /// <summary>\n";
+                InputDtoContent += $"       /// 设置或获取{dbFieldInfo.ColumnDescription}\n";
+                InputDtoContent += "        /// </summary>\n";
+                InputDtoContent += $"        public {TableMappingHelper.GetPropertyDatatype(dbFieldInfo.DataType)} {columnName} {{ get; set; }}\n\r";
+            }
+
+            return InputDtoContent;
+        }
+
+        //form-item
+        private static string GetVueViewFormContent(DbColumnInfo dbFieldInfo, string columnName)
+        {
+            columnName = FirstLowerCase(columnName);
+            string labelName = GetLabelName(dbFieldInfo.ColumnDescription, columnName);
             string vueViewFromContent = "";
             if (dbFieldInfo.DataType == "datetime")
             {
-                vueViewFromContent = "";
+                vueViewFromContent += "";
             }
-            else if (columnName.Contains("iocn,image"))
+            else if (((IList)imageFiled).Contains(columnName))
             {
                 //TODO 图片
             }
-            else if (dbFieldInfo.DataType == "bool" || dbFieldInfo.DataType == "tinyint")
+            else if (radioFiled.Any(f => columnName.Contains(f)) && (dbFieldInfo.DataType == "bool" || dbFieldInfo.DataType == "tinyint"))
             {
-                vueViewFromContent += $"    <el-col :span=\"12\">\n";
-                vueViewFromContent += $"       <el-form-item label=\"{GetLabelName(dbFieldInfo.ColumnDescription, columnName)}\" :label-width=\"labelWidth\" prop=\"{FirstLowerCase(columnName)}\">";
-                vueViewFromContent += $"          <el-radio-group v-model=\"form.{GetLabelName(dbFieldInfo.ColumnDescription, columnName)}\">\n";
-                vueViewFromContent += "           <el-radio label=\"true\">是</el-radio>\n";
-                vueViewFromContent += "           <el-radio label=\"false\">否</el-radio>\n";
+                vueViewFromContent += $"     <el-col :span=\"12\">\n";
+                vueViewFromContent += $"       <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">";
+                vueViewFromContent += $"         <el-radio-group v-model=\"form.{columnName}\">\n";
+                vueViewFromContent += "           <el-radio v-for=\"dict in statusOptions\" :key=\"dict.dictValue\" :label=\"dict.dictValue\">{{dict.dictLabel}}</el-radio>\n";
                 vueViewFromContent += "          </el-radio-group>\n";
                 vueViewFromContent += "        </el-form-item>\n";
-                vueViewFromContent += "     </el-col>\n";
+                vueViewFromContent += "      </el-col>\n";
             }
             else
             {
-                vueViewFromContent += $"    <el-col :span=\"12\">\n";
+                vueViewFromContent += $"     <el-col :span=\"12\">\n";
                 vueViewFromContent += $"        <el-form-item label=\"{ GetLabelName(dbFieldInfo.ColumnDescription, columnName)}\" :label-width=\"labelWidth\" prop=\"{FirstLowerCase(columnName)}\">\n";
                 vueViewFromContent += $"           <el-input v-model=\"form.{FirstLowerCase(columnName)}\" placeholder=\"请输入{GetLabelName(dbFieldInfo.ColumnDescription, columnName)}\" />\n";
                 vueViewFromContent += "         </el-form-item>\n";
-                vueViewFromContent += "     </el-col>\n";
+                vueViewFromContent += "      </el-col>\n";
             }
 
             return vueViewFromContent;
@@ -202,27 +223,36 @@ namespace ZR.CodeGenerator
         //table-column
         private static string GetTableColumn(DbColumnInfo dbFieldInfo, string columnName)
         {
+            columnName = FirstLowerCase(columnName);
+            string label = GetLabelName(dbFieldInfo.ColumnDescription, columnName);
             string vueViewListContent = "";
-            string showToolTip = dbFieldInfo.DataType == "varchar" ? ":show-overflow-tooltip=\"true\"" : "";
+            string showToolTip = dbFieldInfo.DataType.Contains("varchar") ? ":show-overflow-tooltip=\"true\"" : "";
 
-            if (dbFieldInfo.DataType == "bool" || dbFieldInfo.DataType == "tinyint")
+            if (imageFiled.Any(f => columnName.ToLower().Contains(f)))
             {
-                vueViewListContent += $"        <el-table-column prop=\"{FirstLowerCase(columnName)}\" label=\"{GetLabelName(dbFieldInfo.ColumnDescription, columnName)}\" width=\"120\" >\n";
+                vueViewListContent += $"      <el-table-column prop=\"{ columnName}\" label=\"图片\">\n";
+                vueViewListContent += "         <template slot-scope=\"scope\">\n";
+                vueViewListContent += $"            <el-image class=\"table-td-thumb\" :src=\"scope.row.{columnName}\" :preview-src-list=\"[scope.row.{columnName}]\"></el-image>\n";
+                vueViewListContent += "         </template>\n";
+                vueViewListContent += "       </el-table-column>\n";
+            }
+            else if (dbFieldInfo.DataType == "bool" || dbFieldInfo.DataType == "tinyint")
+            {
+                vueViewListContent += $"        <el-table-column prop=\"{columnName}\" label=\"{label}\" width=\"120\" >\n";
                 vueViewListContent += "          <template slot-scope=\"scope\">\n";
-                vueViewListContent += string.Format("            <el-tag :type=\"scope.row.{0} === true ? 'success' : 'info'\"  disable-transitions >", columnName);
-                vueViewListContent += "{{ ";
-                vueViewListContent += string.Format("scope.row.{0}===true?'启用':'禁用' ", columnName);
-                vueViewListContent += "}}</el-tag>\n";
+                vueViewListContent += $"            <el-tag :type=\"scope.row.{columnName} === true ? 'success' : 'info'\"  disable-transitions >";
+                vueViewListContent += $"                {{scope.row.{columnName}===true?'启用':'禁用'}} </el-tag>\n";
                 vueViewListContent += "          </template>\n";
                 vueViewListContent += "        </el-table-column>\n";
             }
             else
             {
                 //table-column
-                vueViewListContent += $"        <el-table-column prop=\"{FirstLowerCase(columnName)}\" label=\"{GetLabelName(dbFieldInfo.ColumnDescription, columnName)}\"  align=\"center\" width=\"100\" {showToolTip} />\n";
+                vueViewListContent += $"      <el-table-column prop=\"{FirstLowerCase(columnName)}\" label=\"{GetLabelName(dbFieldInfo.ColumnDescription, columnName)}\"  align=\"center\" width=\"100\" {showToolTip} />\n";
             }
             return vueViewListContent;
         }
+        #endregion
 
         #region 生成Model
 
@@ -240,14 +270,14 @@ namespace ZR.CodeGenerator
         {
             var parentPath = "..";
             //../ZR.Model
-            var servicesPath = parentPath + "\\" + _option.BaseNamespace + "\\" + modelsNamespace;
+            var servicesPath = parentPath + "\\" + modelsNamespace + "\\Models\\";
             if (!Directory.Exists(servicesPath))
             {
-                //servicesPath = parentPath + "\\" + _option.ModelsNamespace;
                 Directory.CreateDirectory(servicesPath);
             }
             // ../ZR.Model/Models/User.cs
-            var fullPath = servicesPath + "\\Models\\" + modelTypeName + ".cs";
+            var fullPath = servicesPath + modelTypeName + ".cs";
+            Console.WriteLine(fullPath);
             if (File.Exists(fullPath) && !ifExsitedCovered)
                 return;
             var content = ReadTemplate("ModelTemplate.txt");
@@ -274,14 +304,14 @@ namespace ZR.CodeGenerator
         private static void GenerateInputDto(string modelsNamespace, string modelTypeName, string modelTypeDesc, string modelContent, string keyTypeName, bool ifExsitedCovered = false)
         {
             var parentPath = "..";
-            var servicesPath = parentPath + "\\" + _option.BaseNamespace + "\\" + modelsNamespace;
+            var servicesPath = parentPath + "\\" + modelsNamespace + "\\Dto\\";
             if (!Directory.Exists(servicesPath))
             {
-                //servicesPath = parentPath + "\\" + _option.BaseNamespace + "\\Dtos";
                 Directory.CreateDirectory(servicesPath);
             }
             // ../ZR.Model/Dto/User.cs
-            var fullPath = servicesPath + "\\Dto\\" + modelTypeName + "Dto.cs";
+            var fullPath = servicesPath + modelTypeName + "Dto.cs";
+            Console.WriteLine(fullPath);
             if (File.Exists(fullPath) && !ifExsitedCovered)
                 return;
             var content = ReadTemplate("InputDtoTemplate.txt");
@@ -308,20 +338,19 @@ namespace ZR.CodeGenerator
         /// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param>
         private static void GenerateRepository(string modelTypeName, string modelTypeDesc, string tableName, string keyTypeName, bool ifExsitedCovered = false)
         {
-            //var path = AppDomain.CurrentDomain.BaseDirectory;
-            var parentPath = "..";// path.Substring(0, path.LastIndexOf("\\"));
-            var repositoryPath = parentPath + "\\" + _option.BaseNamespace + "\\" + _option.RepositoriesNamespace;
+            var parentPath = "..";
+            var repositoryPath = parentPath + "\\" + _option.RepositoriesNamespace + "\\Repositories\\";
             if (!Directory.Exists(repositoryPath))
             {
-                //repositoryPath = parentPath + "\\" + _option.BaseNamespace + "\\Repositories";
                 Directory.CreateDirectory(repositoryPath);
             }
             var fullPath = repositoryPath + "\\" + modelTypeName + "Repository.cs";
+            Console.WriteLine(fullPath);
             if (File.Exists(fullPath) && !ifExsitedCovered)
                 return;
             var content = ReadTemplate("RepositoryTemplate.txt");
             content = content.Replace("{ModelsNamespace}", _option.ModelsNamespace)
-                .Replace("{IRepositoriesNamespace}", _option.IRepositoriesNamespace)
+                //.Replace("{IRepositoriesNamespace}", _option.IRepositoriesNamespace)
                 .Replace("{RepositoriesNamespace}", _option.RepositoriesNamespace)
                 .Replace("{ModelTypeName}", modelTypeName)
                 .Replace("{TableNameDesc}", modelTypeDesc)
@@ -343,16 +372,14 @@ namespace ZR.CodeGenerator
         /// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param>
         private static void GenerateIService(string modelsNamespace, string modelTypeName, string modelTypeDesc, string keyTypeName, bool ifExsitedCovered = false)
         {
-            //var path = AppDomain.CurrentDomain.BaseDirectory;
-            //path = path.Substring(0, path.IndexOf("\\bin"));
-            var parentPath = "..";// path.Substring(0, path.LastIndexOf("\\"));
-            var iServicesPath = parentPath + "\\" + _option.BaseNamespace + "\\" + _option.IServicsNamespace;
+            var parentPath = "..";
+            var iServicesPath = parentPath + "\\" + _option.IServicsNamespace + "\\Business\\IBusService\\";
             if (!Directory.Exists(iServicesPath))
             {
-                iServicesPath = parentPath + "\\" + _option.BaseNamespace + "\\IBusService";
                 Directory.CreateDirectory(iServicesPath);
             }
-            var fullPath = $"{iServicesPath}\\Business\\IService\\I{modelTypeName}Service.cs";
+            var fullPath = $"{iServicesPath}\\I{modelTypeName}Service.cs";
+            Console.WriteLine(fullPath);
             if (File.Exists(fullPath) && !ifExsitedCovered)
                 return;
             var content = ReadTemplate("IServiceTemplate.txt");
@@ -375,16 +402,13 @@ namespace ZR.CodeGenerator
         /// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param>
         private static void GenerateService(string modelsNamespace, string modelTypeName, string modelTypeDesc, string keyTypeName, bool ifExsitedCovered = false)
         {
-            //var path = AppDomain.CurrentDomain.BaseDirectory;
-            //path = path.Substring(0, path.IndexOf("\\bin"));
-            var parentPath = "..";// path.Substring(0, path.LastIndexOf("\\"));
-            var servicesPath = parentPath + "\\" + _option.BaseNamespace + "\\" + _option.ServicesNamespace;
+            var parentPath = "..";
+            var servicesPath = parentPath + "\\" + _option.ServicesNamespace + "\\Business\\";
             if (!Directory.Exists(servicesPath))
             {
-                servicesPath = parentPath + "\\" + _option.BaseNamespace + "\\Business";
                 Directory.CreateDirectory(servicesPath);
             }
-            var fullPath = servicesPath + "\\Business\\" + modelTypeName + "Service.cs";
+            var fullPath = servicesPath + modelTypeName + "Service.cs";
             Console.WriteLine(fullPath);
             if (File.Exists(fullPath) && !ifExsitedCovered)
                 return;
@@ -414,18 +438,13 @@ namespace ZR.CodeGenerator
         /// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param>
         private static void GenerateControllers(string modelTypeName, string primaryKey, string modelTypeDesc, string keyTypeName, bool ifExsitedCovered = false)
         {
-            //var servicesNamespace = _option.DtosNamespace;
-            //var fileClassName = _option.BaseNamespace.Substring(_option.BaseNamespace.IndexOf('.') + 1);
-            //var path = AppDomain.CurrentDomain.BaseDirectory;
-            //path = path.Substring(0, path.IndexOf("\\bin"));
-            var parentPath = "..";//path.Substring(0, path.LastIndexOf("\\"));
-            var servicesPath = parentPath + "\\" + _option.BaseNamespace + "\\" + _option.ApiControllerNamespace;
+            var parentPath = "..";
+            var servicesPath = parentPath + "\\" + _option.ApiControllerNamespace + "\\Controllers\\business\\";
             if (!Directory.Exists(servicesPath))
             {
-                servicesPath = parentPath + "\\" + _option.BaseNamespace + "\\Controllers\\";
                 Directory.CreateDirectory(servicesPath);
             }
-            var fullPath = servicesPath + "\\Controllers\\business\\" + modelTypeName + "Controller.cs";
+            var fullPath = servicesPath + modelTypeName + "Controller.cs";
             Console.WriteLine(fullPath);
             if (File.Exists(fullPath) && !ifExsitedCovered)
                 return;
@@ -437,6 +456,7 @@ namespace ZR.CodeGenerator
                 .Replace("<#=FileName#>", modelTypeDesc)
                 .Replace("<#=ServiceName#>", modelTypeName + "Service")
                 .Replace("<#=ModelName#>", modelTypeName)
+                .Replace("<#=Permission#>", modelTypeName.ToLower())
                 .Replace("{primaryKey}", primaryKey)
                 .Replace("{KeyTypeName}", keyTypeName);
             WriteAndSave(fullPath, content);
@@ -459,14 +479,12 @@ namespace ZR.CodeGenerator
         private static void GenerateVueViews(string modelTypeName, string primaryKey, string modelTypeDesc, string vueViewListContent, string vueViewFromContent, string vueViewEditFromContent, string vueViewEditFromBindContent, string vueViewSaveBindContent, string vueViewEditFromRuleContent, bool ifExsitedCovered = false)
         {
             var servicesNamespace = _option.DtosNamespace;
-            var fileClassName = _option.BaseNamespace.Substring(_option.BaseNamespace.IndexOf('.') + 1);
-            var path = AppDomain.CurrentDomain.BaseDirectory;
-            //path = path.Substring(0, path.IndexOf("\\bin"));
+            var path = "..\\CodeGenerate\\";
             var parentPath = path.Substring(0, path.LastIndexOf("\\"));
             var servicesPath = parentPath + "\\" + _option.BaseNamespace + "\\" + servicesNamespace;
             if (!Directory.Exists(servicesPath))
             {
-                servicesPath = parentPath + "\\" + _option.BaseNamespace + "\\vue\\" + modelTypeName.ToLower();
+                servicesPath = parentPath + "\\" + _option.BaseNamespace + "\\views\\" + FirstLowerCase(modelTypeName);
                 Directory.CreateDirectory(servicesPath);
             }
             var fullPath = servicesPath + "\\" + "index.vue";
@@ -474,12 +492,12 @@ namespace ZR.CodeGenerator
                 return;
             var content = ReadTemplate("VueTemplate.txt");
             content = content
-                .Replace("{BaseNamespace}", fileClassName.ToLower())
-                .Replace("{fileClassName}", modelTypeName.ToLower())
-                .Replace("{ModelTypeNameToLower}", modelTypeName.ToLower())
+                //.Replace("{BaseNamespace}", fileClassName.ToLower())
+                .Replace("{fileClassName}", FirstLowerCase(modelTypeName))
+                .Replace("{ModelTypeNameToLower}", FirstLowerCase(modelTypeName))
                 .Replace("{VueViewListContent}", vueViewListContent)
                 .Replace("{VueViewFromContent}", vueViewFromContent)
-                .Replace("{ModelTypeName}", modelTypeName)
+                .Replace("{ModelTypeName}", FirstLowerCase(modelTypeName))
                 .Replace("{VueViewEditFromContent}", vueViewEditFromContent)
                 .Replace("{VueViewEditFromBindContent}", vueViewEditFromBindContent)
                 .Replace("{VueViewSaveBindContent}", vueViewSaveBindContent)
@@ -487,14 +505,14 @@ namespace ZR.CodeGenerator
                 .Replace("{VueViewEditFromRuleContent}", vueViewEditFromRuleContent);
             WriteAndSave(fullPath, content);
 
-            fullPath = servicesPath + "\\" + modelTypeName.ToLower() + ".js";
+            fullPath = servicesPath + "\\" + FirstLowerCase(modelTypeName) + ".js";
             if (File.Exists(fullPath) && !ifExsitedCovered)
                 return;
             content = ReadTemplate("VueJsTemplate.txt");
             content = content
-                .Replace("{ModelTypeName}", modelTypeName)
-                .Replace("{ModelTypeDesc}", modelTypeDesc)
-                .Replace("{fileClassName}", fileClassName);
+                .Replace("{ModelTypeName}", FirstLowerCase(modelTypeName))
+                .Replace("{ModelTypeDesc}", modelTypeDesc);
+            //.Replace("{fileClassName}", fileClassName)
             WriteAndSave(fullPath, content);
         }
 
@@ -502,6 +520,12 @@ namespace ZR.CodeGenerator
 
         #region 帮助方法
 
+
+        /// <summary>
+        /// 如果有前缀替换将前缀替换成空，替换下划线"_"为空再将首字母大写
+        /// </summary>
+        /// <param name="modelTypeName"></param>
+        /// <returns></returns>
         private static string GetModelName(string modelTypeName)
         {
             if (!string.IsNullOrEmpty(_option.ReplaceTableNameStr))
@@ -512,15 +536,22 @@ namespace ZR.CodeGenerator
             modelTypeName = modelTypeName.Substring(0, 1).ToUpper() + modelTypeName.Substring(1);
             return modelTypeName;
         }
+        /// <summary>
+        /// 首字母转小写，输出前端
+        /// </summary>
+        /// <param name="str"></param>
+        /// <returns></returns>
         private static string FirstLowerCase(string str)
         {
-            if (string.IsNullOrEmpty(str))
-            {
-                return str;
-            }
-            str = str.Substring(0, 1).ToLower() + str.Substring(1);
-            return str;
+            return string.IsNullOrEmpty(str) ? str : str.Substring(0, 1).ToLower() + str[1..];
         }
+
+        /// <summary>
+        /// 获取前端标签名
+        /// </summary>
+        /// <param name="columnDescription"></param>
+        /// <param name="columnName"></param>
+        /// <returns></returns>
         private static string GetLabelName(string columnDescription, string columnName)
         {
             return string.IsNullOrEmpty(columnDescription) ? columnName : columnDescription;
diff --git a/ZR.CodeGenerator/Model/GenerateDto.cs b/ZR.CodeGenerator/Model/GenerateDto.cs
new file mode 100644
index 0000000..be9e00f
--- /dev/null
+++ b/ZR.CodeGenerator/Model/GenerateDto.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZR.CodeGenerator.Model
+{
+    public class GenerateDto
+    {
+        public string queryColumn { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string dbName { get; set; }
+        /// <summary>
+        /// 项目命名空间
+        /// </summary>
+        public string baseSpace { get; set; }
+        /// <summary>
+        /// 要生成代码的表
+        /// </summary>
+        public string tables { get; set; }
+        /// <summary>
+        /// 要删除表名的字符串用
+        /// </summary>
+        public string replaceTableNameStr { get; set; }
+        /// <summary>
+        /// 要生成的文件
+        /// </summary>
+        public int[] genFiles { get; set; }
+        public bool coverd { get; set; } = true;
+    }
+}
diff --git a/ZR.CodeGenerator/Service/CodeGeneraterService.cs b/ZR.CodeGenerator/Service/CodeGeneraterService.cs
index f24f4e1..50fd886 100644
--- a/ZR.CodeGenerator/Service/CodeGeneraterService.cs
+++ b/ZR.CodeGenerator/Service/CodeGeneraterService.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using ZR.Model;
-using ZR.Model.CodeGenerator;
 
 namespace ZR.CodeGenerator.Service
 {
@@ -12,18 +11,12 @@ namespace ZR.CodeGenerator.Service
         /// 获取所有数据库名
         /// </summary>
         /// <returns></returns>
-        public List<DataBaseInfo> GetAllDataBases()
+        public List<string> GetAllDataBases()
         {
-            List<DataBaseInfo> list = new();
-
             var db = GetSugarDbContext();
             var templist = db.DbMaintenance.GetDataBaseList(db.ScopedContext);
-            templist.ForEach(item =>
-            {
-                list.Add(new DataBaseInfo() { DbName = item });
-            });
 
-            return list;
+            return templist;
         }
 
         /// <summary>
diff --git a/ZR.Model/CodeGenerator/DataBaseInfo.cs b/ZR.Model/CodeGenerator/DataBaseInfo.cs
deleted file mode 100644
index 3d8c16d..0000000
--- a/ZR.Model/CodeGenerator/DataBaseInfo.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace ZR.Model.CodeGenerator
-{
-    public class DataBaseInfo
-    {
-        /// <summary>
-        /// 数据库名称
-        /// </summary>
-        public string DbName { get; set; }
-    }
-}
diff --git a/ZR.Repository/ZR.Repository.csproj b/ZR.Repository/ZR.Repository.csproj
index c4175f5..dd8fc0f 100644
--- a/ZR.Repository/ZR.Repository.csproj
+++ b/ZR.Repository/ZR.Repository.csproj
@@ -15,4 +15,8 @@
     <PackageReference Include="NETCore.Encrypt" Version="2.0.9" />
     <PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.3.4" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Repositories\" />
+  </ItemGroup>
 </Project>
diff --git a/ZR.Service/IService/ICodeGeneratorService.cs b/ZR.Service/IService/ICodeGeneratorService.cs
deleted file mode 100644
index 2e713a9..0000000
--- a/ZR.Service/IService/ICodeGeneratorService.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ZR.Model;
-using ZR.Model.CodeGenerator;
-
-namespace ZR.Service.IService
-{
-    //public interface ICodeGeneratorService
-    //{
-    //    List<DataBaseInfo> GetAllDataBases();
-
-    //    List<SqlSugar.DbTableInfo> GetTablesWithPage(string tablename, string dbName, PagerInfo info);
-
-    //    List<DbFieldInfo> GetAllColumns(string tableName);
-
-    //    List<DbTableInfo> GetAllTables(string tabList);
-
-    //    List<SqlSugar.DbColumnInfo> GetColumnInfo(string dbName, string tableName);
-    //}
-}
diff --git a/ZR.Service/ZR.Service.csproj b/ZR.Service/ZR.Service.csproj
index c5a4822..a27cb43 100644
--- a/ZR.Service/ZR.Service.csproj
+++ b/ZR.Service/ZR.Service.csproj
@@ -11,6 +11,7 @@
 
   <ItemGroup>
     <Folder Include="Business\" />
+    <Folder Include="Business\IBusService\" />
   </ItemGroup>
 
 </Project>
diff --git a/ZR.Vue/document/t4.tt b/ZR.Vue/document/t4.tt
deleted file mode 100644
index e69de29..0000000
diff --git a/ZR.Vue/document/template.vue b/ZR.Vue/document/template.vue
index 9a4ce72..51f7a1e 100644
--- a/ZR.Vue/document/template.vue
+++ b/ZR.Vue/document/template.vue
@@ -2,9 +2,9 @@
   <div class="app-container">
     <el-row :gutter="24">
       <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
-      <el-form :model="queryParams" label-position="left" inline ref="queryForm" v-show="showSearch" @submit.native.prevent>
+      <el-form :model="queryParams" label-position="left" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" @submit.native.prevent>
         <el-col :span="6">
-          <el-form-item label="文本">
+          <el-form-item label="文本文字">
             <el-input v-model="queryParams.xxx" placeholder="" />
           </el-form-item>
         </el-col>
@@ -16,18 +16,18 @@
         <el-col :span="6">
           <el-form-item label="下拉框">
             <el-select v-model="queryParams.xxx" placeholder="">
-              <el-option v-for="dict in options" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+              <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="时间范围">
-            <el-date-picker v-model="queryParams.timeRange" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+            <el-date-picker size="small" style="width: 240px" v-model="timeRange" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="24" style="text-align:center;">
-          <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         </el-col>
       </el-form>
@@ -44,13 +44,13 @@
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport">导入</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch"></right-toolbar>
+      </el-col> -->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <!-- 数据区域 -->
@@ -58,13 +58,9 @@
       <el-table-column prop="id" label="id" width="60" sortable> </el-table-column>
       <el-table-column prop="userId" label="userid" width="80"> </el-table-column>
       <!-- 显示图片 -->
-      <el-table-column prop="photo" label="图片" width="110">
+      <el-table-column prop="photo" label="图片">
         <template slot-scope="scope">
-          <el-popover placement="right" trigger="hover">
-            <!-- click显示的大图 -->
-            <img :src="scope.row.photo" />
-            <img slot="reference" :src="scope.row.photo" width="100" height="50">
-          </el-popover>
+          <el-image class="table-td-thumb" :src="scope.row.photo" :preview-src-list="[scope.row.photo]"></el-image>
         </template>
       </el-table-column>
       <el-table-column prop="content" label="介绍" width="100" :show-overflow-tooltip="true">
@@ -90,7 +86,7 @@
 
     <!-- 添加或修改菜单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户Id" prop="userId">
@@ -110,7 +106,7 @@
           <el-col :span="12">
             <el-form-item label="状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in options" :key="dict.dictValue" :label="dict.dictValue">{{dict.dictLabel}}</el-radio>
+                <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{dict.dictLabel}}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -136,23 +132,23 @@ export default {
   name: "demo",
   data() {
     return {
+      labelWidth: "70px",
       // 遮罩层
       loading: true,
       // 显示搜索条件
       showSearch: true,
       // 查询参数
-      queryParams: {
-        useridx: undefined,
-        name: undefined,
-      },
+      queryParams: {},
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
       // 表单参数
       form: {},
+      // 时间范围数组
+      timeRange: [],
       // xxx下拉框
-      options: [],
+      statusOptions: [],
       // 数据列表
       dataList: [
         {
@@ -174,18 +170,30 @@ export default {
       // 表单校验
       rules: {
         name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
-        userId: [{ required: true, message: "id不能为空", trigger: "blur" }],
+        userId: [
+          {
+            type: "number",
+            required: true,
+            message: "id不能为空,且不能为非数字",
+            trigger: "blur",
+          },
+        ],
       },
     };
   },
   mounted() {
+    // 列表数据查询
     this.getList();
+    // 下拉框绑定
+    // this.getDicts("sys_normal_disable").then((response) => {
+    //   this.statusOptions = response.data;
+    // });
   },
   methods: {
     // 查询数据
     getList() {
       console.log(JSON.stringify(this.queryParams));
-      // listXXXX().then(res => {
+      // listXXXX(this.addDateRange(this.queryParams, this.timeRange)).then(res => {
       //   if (res.code == 200) {
       //     this.dataList = res.data.result;
       //     this.total = res.data.totalCount;
@@ -199,7 +207,6 @@ export default {
     },
     // 重置数据表单
     reset() {
-      this.btnSubmitVisible = true;
       this.form = {
         Id: undefined,
         // TODO 其他列字段
@@ -208,7 +215,12 @@ export default {
     },
     /** 重置查询操作 */
     resetQuery() {
+      this.timeRange = [];
       this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+        //TODO 重置字段
+      };
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -224,11 +236,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      //   delXXX().then(function () {
-
-      //   })
-      //   .then(() => {
+      //   delXXX().then((res) => {
       //     this.msgSuccess("删除成功");
+      //     this.handleQuery();
       //   });
     },
     /** 修改按钮操作 */
@@ -278,3 +288,8 @@ export default {
   },
 };
 </script>
+<style scoped>
+.table-td-thumb {
+  width: 80px;
+}
+</style>
diff --git a/ZR.Vue/src/api/tool/gen.js b/ZR.Vue/src/api/tool/gen.js
index 88e4a3d..348f6c3 100644
--- a/ZR.Vue/src/api/tool/gen.js
+++ b/ZR.Vue/src/api/tool/gen.js
@@ -70,7 +70,7 @@ export function genCode(tableName) {
 // 同步数据库
 export function synchDb(tableName) {
   return request({
-    url: '/tool/gen/synchDb/' + tableName,
+    url: 'tool/gen/synchDb/' + tableName,
     method: 'get'
   })
 }
@@ -80,9 +80,9 @@ export function synchDb(tableName) {
 /**
    * 创建数据库连接
    */
- export function createGetDBConn(data) {
+export function createGetDBConn(data) {
   return request({
-    url: 'CodeGenerator/CreateDBConn',
+    url: 'tool/gen/CreateDBConn',
     method: 'post',
     data: data,
   })
@@ -92,7 +92,7 @@ export function synchDb(tableName) {
    */
 export function codeGetDBList() {
   return request({
-    url: 'CodeGenerator/GetListDataBase',
+    url: 'tool/gen/getDbList',
     method: 'get',
   })
 }
@@ -101,7 +101,7 @@ export function codeGetDBList() {
    */
 export function codeGetTableList(data) {
   return request({
-    url: 'CodeGenerator/FindListTable',
+    url: 'tool/gen/FindListTable',
     method: 'get',
     params: data,
   })
@@ -111,12 +111,26 @@ export function codeGetTableList(data) {
    */
 export async function codeGenerator(data) {
   return await request({
-    url: 'CodeGenerator/Generate',
-    method: 'get',
-    params: data,
+    url: '/tool/gen/Generate',
+    method: 'post',
+    data: data,
     timeout: 0,
   })
 }
+
+/**
+ * 获取表格列信息
+ * @param {*} data
+ * @returns
+ */
+export function queryColumnInfo(data) {
+  return request({
+    url: 'tool/gen/queryColumnInfo',
+    method: 'GET',
+    params: data,
+  })
+}
+
 /**
  *
 * 数据库解密
diff --git a/ZR.Vue/src/views/demo.vue b/ZR.Vue/src/views/demo.vue
index 4d03edb..51f7a1e 100644
--- a/ZR.Vue/src/views/demo.vue
+++ b/ZR.Vue/src/views/demo.vue
@@ -36,13 +36,13 @@
     <!-- 工具区域 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" v-hasPermi="['Article:add']" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" v-hasPermi="['Article:update']" plain icon="el-icon-edit" size="mini" @click="handleUpdate">修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" v-hasPermi="['Article:delete']" plain icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport">导入</el-button>
@@ -54,27 +54,30 @@
     </el-row>
 
     <!-- 数据区域 -->
-    <el-table :data="dataList" ref="table" border @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="50" />
-      <el-table-column prop="cid" label="Cid" align="center" width="100" />
-      <el-table-column prop="title" label="文章标题" align="center" width="100" :show-overflow-tooltip="true" />
-      <el-table-column prop="content" label="文章内容" align="center" width="100" />
-      <el-table-column prop="userId" label="用户id" align="center" width="100" />
-      <el-table-column prop="status" label="文章状态1、已发布 2、草稿" align="center" width="100" :show-overflow-tooltip="true" />
-      <el-table-column prop="fmt_type" label="编辑器类型markdown,html" align="center" width="100" :show-overflow-tooltip="true" />
-      <el-table-column prop="tags" label="文章标签" align="center" width="100" :show-overflow-tooltip="true" />
-      <el-table-column prop="hits" label="点击量" align="center" width="100" />
-      <el-table-column prop="category_id" label="目录id" align="center" width="100" />
-      <el-table-column prop="createTime" label="创建时间" align="center" width="100" />
-      <el-table-column prop="updateTime" label="修改时间" align="center" width="100" />
-      <el-table-column prop="authorName" label="作者名" align="center" width="100" :show-overflow-tooltip="true" />
+    <el-table :data="dataList" ref="table" border>
+      <el-table-column prop="id" label="id" width="60" sortable> </el-table-column>
+      <el-table-column prop="userId" label="userid" width="80"> </el-table-column>
+      <!-- 显示图片 -->
+      <el-table-column prop="photo" label="图片">
+        <template slot-scope="scope">
+          <el-image class="table-td-thumb" :src="scope.row.photo" :preview-src-list="[scope.row.photo]"></el-image>
+        </template>
+      </el-table-column>
+      <el-table-column prop="content" label="介绍" width="100" :show-overflow-tooltip="true">
+      </el-table-column>
+      <el-table-column sortable prop="isStart" align="center" label="状态" width="90">
+        <template>
+          <el-tag size="mini" type="success" disable-transitions>标签</el-tag>
+        </template>
+      </el-table-column>
 
+      <el-table-column prop="addtime" label="创建时间"> </el-table-column>
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">详情</el-button>
-          <el-button size="mini" v-hasPermi="['Article:update']" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">编辑</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">编辑</el-button>
           <el-popconfirm title="确定删除吗？" @onConfirm="handleDelete(scope.row)" style="margin-left:10px">
-            <el-button slot="reference" v-hasPermi="['Article:del']" size="mini" type="text" icon="el-icon-delete">删除</el-button>
+            <el-button slot="reference" size="mini" type="text" icon="el-icon-delete">删除</el-button>
           </el-popconfirm>
         </template>
       </el-table-column>
@@ -84,57 +87,35 @@
     <!-- 添加或修改菜单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-col :span="12">
-          <el-form-item label="Cid" :label-width="labelWidth" prop="cid">
-            <el-input v-model="form.cid" placeholder="请输入Cid" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="文章标题" :label-width="labelWidth" prop="title">
-            <el-input v-model="form.title" placeholder="请输入文章标题" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="文章内容" :label-width="labelWidth" prop="content">
-            <el-input v-model="form.content" placeholder="请输入文章内容" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用户id" :label-width="labelWidth" prop="userId">
-            <el-input v-model="form.userId" placeholder="请输入用户id" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="文章状态1、已发布 2、草稿" :label-width="labelWidth" prop="status">
-            <el-input v-model="form.status" placeholder="请输入文章状态1、已发布 2、草稿" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="编辑器类型markdown,html" :label-width="labelWidth" prop="fmt_type">
-            <el-input v-model="form.fmt_type" placeholder="请输入编辑器类型markdown,html" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="文章标签" :label-width="labelWidth" prop="tags">
-            <el-input v-model="form.tags" placeholder="请输入文章标签" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="点击量" :label-width="labelWidth" prop="hits">
-            <el-input v-model="form.hits" placeholder="请输入点击量" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="目录id" :label-width="labelWidth" prop="category_id">
-            <el-input v-model="form.category_id" placeholder="请输入目录id" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="作者名" :label-width="labelWidth" prop="authorName">
-            <el-input v-model="form.authorName" placeholder="请输入作者名" />
-          </el-form-item>
-        </el-col>
-
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="用户Id" prop="userId">
+              <el-input v-model.number="form.userId" placeholder="" :disabled="form.userId > 0" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用户昵称" prop="name">
+              <el-input v-model="form.name" placeholder="" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="顺序" prop="sortId">
+              <el-input-number v-model="form.sortId" controls-position="right" :min="0" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态" prop="status">
+              <el-radio-group v-model="form.status">
+                <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{dict.dictLabel}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="content">
+              <el-input v-model="form.content" :rows="2" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer" v-if="btnSubmitVisible">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -145,17 +126,13 @@
   </div>
 </template>
 <script>
-// import { listArticle,addArticle,delArticle,editArticle } from '@/api/Article.js'
+// import { listXXXX} from '@/api/xxxx.js'
 
 export default {
-  name: "Article",
+  name: "demo",
   data() {
     return {
       labelWidth: "70px",
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
       // 遮罩层
       loading: true,
       // 显示搜索条件
@@ -173,14 +150,34 @@ export default {
       // xxx下拉框
       statusOptions: [],
       // 数据列表
-      dataList: [],
+      dataList: [
+        {
+          id: 1,
+          photo:
+            "https://ss1.baidu.com/-4o3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/d788d43f8794a4c2b124d0000df41bd5ad6e3991.jpg",
+          name: "你好",
+          userId: 1000001,
+          sortId: 1,
+          address: "浙江省杭州市西湖区",
+          content: "我是一个超长超长的文字啊",
+          addtime: "2021-8-7 23:00:00",
+        },
+      ],
       // 总记录数
       total: 0,
       // 提交按钮是否显示
       btnSubmitVisible: true,
       // 表单校验
       rules: {
-        Cid: [{ required: true, message: "请输入", trigger: "blur" }],
+        name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+        userId: [
+          {
+            type: "number",
+            required: true,
+            message: "id不能为空,且不能为非数字",
+            trigger: "blur",
+          },
+        ],
       },
     };
   },
@@ -196,14 +193,12 @@ export default {
     // 查询数据
     getList() {
       console.log(JSON.stringify(this.queryParams));
-      listArticle(this.addDateRange(this.queryParams, this.timeRange)).then(
-        (res) => {
-          if (res.code == 200) {
-            this.dataList = res.data.result;
-            this.total = res.data.totalCount;
-          }
-        }
-      );
+      // listXXXX(this.addDateRange(this.queryParams, this.timeRange)).then(res => {
+      //   if (res.code == 200) {
+      //     this.dataList = res.data.result;
+      //     this.total = res.data.totalCount;
+      //   }
+      // })
     },
     // 取消按钮
     cancel() {
@@ -213,20 +208,8 @@ export default {
     // 重置数据表单
     reset() {
       this.form = {
-        Cid: "",
-        Title: "",
-        Content: "",
-        UserId: "",
-        Status: "",
-        Fmt_type: "",
-        Tags: "",
-        Hits: "",
-        Category_id: "",
-        CreateTime: "",
-        UpdateTime: "",
-        AuthorName: "",
-
-        //需个性化处理内容
+        Id: undefined,
+        // TODO 其他列字段
       };
       this.resetForm("form");
     },
@@ -239,11 +222,6 @@ export default {
         //TODO 重置字段
       };
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.Cid);
-      this.multiple = !selection.length;
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.getList();
@@ -258,10 +236,10 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      delArticle().then((res) => {
-        this.msgSuccess("删除成功");
-        this.handleQuery();
-      });
+      //   delXXX().then((res) => {
+      //     this.msgSuccess("删除成功");
+      //     this.handleQuery();
+      //   });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -285,7 +263,7 @@ export default {
         if (valid) {
           console.log(JSON.stringify(this.form));
           // TODO 记得改成表的主键
-          if (this.form.Cid != undefined) {
+          if (this.form.Id != undefined) {
             //TODO 编辑业务代码
           } else {
             //TODO 新增业务代码
diff --git a/ZR.Vue/src/views/tool/index.vue b/ZR.Vue/src/views/tool/index.vue
index dcdeef6..b1602b5 100644
--- a/ZR.Vue/src/views/tool/index.vue
+++ b/ZR.Vue/src/views/tool/index.vue
@@ -1,44 +1,15 @@
 <template>
   <div class="app-container">
-    <!-- <div class="filter-container">
-      <el-card>
-        <el-form ref="searchDbform" :inline="true" :model="searchform" class="demo-form-inline" size="small">
-          <el-form-item label="数据库地址" prop="DbAddress">
-            <el-input v-model="searchDbform.DbAddress" placeholder="请输入数据库地址" autocomplete="off" clearable />
-          </el-form-item>
-          <el-form-item label="数据库名称" prop="DbName">
-            <el-input v-model="searchDbform.DbName" placeholder="请输入数据库名称" autocomplete="off" clearable />
-          </el-form-item>
-          <el-form-item label="用户名" prop="DbUserName">
-            <el-input v-model="searchDbform.DbUserName" placeholder="请输入用户名" autocomplete="off" clearable />
-          </el-form-item>
-          <el-form-item label="访问密码" prop="DbPassword">
-            <el-input v-model="searchDbform.DbPassword" placeholder="请输入访问密码" autocomplete="off" clearable />
-          </el-form-item>
-          <el-form-item label="数据库类型" prop="DbType">
-            <el-select v-model="searchDbform.DbType" clearable placeholder="请选数据库类型">
-              <el-option v-for="item in selectDbTypes" :key="item.Id" :label="item.Title" :value="item.Id" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="数据库端口" prop="DbPort">
-            <el-input v-model="searchDbform.DbPort" placeholder="请输入数据库端口" autocomplete="off" clearable />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="handleDbConn()">链接</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-    </div> -->
     <el-card>
-      <div class="list-btn-container">
-        <el-form ref="codeform" :inline="true" :rules="rules" :model="codeform" class="demo-form-inline" size="small">
+      <div>
+        <el-form ref="codeform" :inline="true" :rules="rules" :model="codeform" size="small">
           <el-form-item label="数据库" prop="dbName">
             <el-select v-model="codeform.dbName" clearable placeholder="请选择" @change="handleShowTable">
-              <el-option v-for="item in selectedDataBase" :key="item.Id" :label="item.dbName" :value="item.dbName" />
+              <el-option v-for="item in selectedDataBase" :key="item" :label="item" :value="item" />
             </el-select>
           </el-form-item>
           <el-form-item label="表名">
-            <el-input v-model="searchform.tableName" clearable placeholder="输入要查询的表名" />
+            <el-input v-model="codeform.tableName" clearable placeholder="输入要查询的表名" />
           </el-form-item>
           <!-- <el-form-item label="项目命名空间：" prop="baseSpace">
             <el-tooltip class="item" effect="dark" content="系统会根据项目命名空间自动生成IService、Service、Models等子命名空间" placement="bottom">
@@ -46,32 +17,89 @@
             </el-tooltip>
           </el-form-item> -->
           <el-form-item label="去掉表名前缀：">
-            <el-tooltip class="item" effect="dark" content="表名直接变为类名，去掉表名前缀。多个前缀用“;”隔开和结束" placement="bottom">
-              <el-input v-model="codeform.replaceTableNameStr" clearable width="300" placeholder="多个前缀用“;”隔开" />
+            <el-tooltip class="item" effect="dark" content="表名直接变为类名，去掉表名前缀。" placement="bottom">
+              <el-input v-model="codeform.replaceTableNameStr" clearable width="300" placeholder="例如：sys_" />
             </el-tooltip>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="handleSearch()">查询</el-button>
-            <!-- <el-button type="primary" icon="iconfont icon-code" @click="handleGenerate()">生成代码</el-button> -->
             <el-button type="default" icon="el-icon-refresh" size="small" @click="loadTableData()">刷新</el-button>
           </el-form-item>
         </el-form>
       </div>
-      <el-table ref="gridtable" v-loading="tableloading" :data="tableData" border stripe highlight-current-row style="width: 100%" @selection-change="handleSelectChange">
+      <el-table ref="gridtable" v-loading="tableloading" :data="tableData" border stripe highlight-current-row style="width: 100%">
         <!-- <el-table-column type="selection" width="50" /> -->
         <el-table-column prop="name" label="表名" sortable="custom" width="380" />
         <el-table-column prop="description" label="表描述" />
         <el-table-column label="操作" align="center" width="200">
           <template slot-scope="scope">
-            <el-button type="text" icon="el-icon-view">预览</el-button>
-            <el-button type="text" icon="el-icon-download" @click="handleGenerate(scope.row)">生成代码</el-button>
+            <el-button type="text" icon="el-icon-view" @click="handlePreview()">预览</el-button>
+            <el-button type="text" icon="el-icon-download" @click="handleShowDialog(scope.row)">生成代码</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <div class="pagination-container">
-        <el-pagination background :current-page="pagination.pageNum" :page-sizes="[5,10,20,50,100, 200, 300, 400]" :page-size="pagination.pagesize" layout="total, sizes, prev, pager, next, jumper" :total="pagination.pageTotal" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-      </div>
+      <el-pagination background :current-page="pagination.pageNum" :page-sizes="[5,10,20,50,100, 200, 300, 400]" :page-size="pagination.pagesize" layout="total, sizes, prev, pager, next, jumper" :total="pagination.pageTotal" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
     </el-card>
+
+    <el-dialog :visible.sync="showGenerate" title="代码生成" width="800px">
+      <el-form ref="codeGenerateForm" label-width="140px">
+        <el-form-item label="要生成的文件">
+          <el-checkbox-group v-model="checkedCodeGenerateForm">
+            <el-checkbox :label="1">生成Model</el-checkbox>
+            <el-checkbox :label="2">生成Dto</el-checkbox>
+            <el-checkbox :label="3">生成Repository</el-checkbox>
+            <el-checkbox :label="4">生成Service</el-checkbox>
+            <el-checkbox :label="5">生成Controller</el-checkbox>
+            <el-checkbox :label="6">生成Views和js</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+
+        <el-form-item label="是否覆盖生成">
+          <el-radio v-model="coverd" :label="true">是</el-radio>
+          <el-radio v-model="coverd" :label="false">否</el-radio>
+        </el-form-item>
+        <el-form-item label="生成查询的列">
+          <!-- <el-checkbox-group v-model="checkedQueryColumn">
+            <el-checkbox :label="item.dbColumnName" v-for="item in columnData" :key="item.dbColumnName">{{item.dbColumnName}}</el-checkbox>
+          </el-checkbox-group> -->
+
+          <el-table :data="columnData" height="300px">
+            <el-table-column type="selection" width="60" />
+            <el-table-column label="字段列名" prop="dbColumnName" />
+            <el-table-column label="字段描述" prop="columnDescription">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.columnDescription" />
+              </template>
+            </el-table-column>
+            <el-table-column label="表数据类型" prop="dataType" />
+            <el-table-column label="C#类型">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.dataType">
+                  <el-option value="int">int</el-option>
+                  <el-option value="bigint">bigint</el-option>
+                  <el-option value="varchar">varchar</el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column label="显示类型">
+              <el-select v-model="selectType">
+                <el-option value="input">文本框</el-option>
+                <el-option value="textArea">文本域</el-option>
+                <el-option value="select">下拉框</el-option>
+                <el-option value="radio">单选框</el-option>
+                <el-option value="datetime">日期控件</el-option>
+                <el-option value="upload">图片上传</el-option>
+                <el-option value="fileUpload">文件上传</el-option>
+              </el-select>
+            </el-table-column> -->
+          </el-table>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleGenerate">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -81,43 +109,28 @@ import {
   codeGetDBList,
   codeGetTableList,
   codeGenerator,
+  queryColumnInfo,
 } from "@/api/tool/gen";
-import { downloadFile } from "@/utils/index";
+// import { downloadFile } from "@/utils/index";
 import { Loading } from "element-ui";
-
-import defaultSettings from "@/settings";
 import template from "../../../document/template.vue";
+
+// import defaultSettings from "@/settings";
+
 export default {
   components: { template },
   name: "CodeGenerator",
   data() {
     return {
-      searchDbform: {
-        DbName: "",
-        DbAddress: "",
-        DbPort: "1433",
-        DbUserName: "",
-        DbPassword: "",
-        DbType: "",
-      },
-      searchform: {
+      codeform: {
         dbName: "",
         tableName: "",
-      },
-      codeform: {
         baseSpace: "",
         replaceTableNameStr: "",
       },
+      showGenerate: false,
+      checkedCodeGenerateForm: [1, 2, 3, 4, 5, 6],
       rules: {
-        // baseSpace: [
-        //   { required: true, message: "请输入项目名称", trigger: "blur" },
-        //   {
-        //     min: 2,
-        //     max: 50,
-        //     message: "长度在 2 到 50 个字符",
-        //     trigger: "blur",
-        //   },
-        // ],
         dbName: [
           { required: true, message: "请选择数据库名称", trigger: "blur" },
         ],
@@ -125,16 +138,6 @@ export default {
           { min: 0, max: 50, message: "长度小于50个字符", trigger: "blur" },
         ],
       },
-      selectDbTypes: [
-        {
-          Id: "SqlServer",
-          Title: "SqlServer",
-        },
-        {
-          Id: "MySql",
-          Title: "MySql",
-        },
-      ],
       tableData: [],
       tableloading: false,
       pagination: {
@@ -142,30 +145,35 @@ export default {
         pagesize: 20,
         pageTotal: 0,
       },
-      sortableData: {
-        order: "",
-        sort: "",
-      },
-      currentSelected: [],
+      // 选中行的表
+      currentSelected: {},
       selectedDataBase: [],
+      // 列信息
+      columnData: [],
+      // 选中的列
+      checkedQueryColumn: [],
+      //是否覆盖原先代码
+      coverd: true,
     };
   },
   created() {
     this.pagination.pageNum = 1;
     this.loadData();
-    // this.loadTableData();
+    this.loadTableData();
   },
   methods: {
-    loadData: function () {
+    loadData() {
       codeGetDBList().then((res) => {
-        this.selectedDataBase = res.data;
+        const { dbList, defaultDb } = res.data;
+        this.codeform.dbName = defaultDb;
+        this.selectedDataBase = dbList;
       });
     },
     /**
      * 加载页面table数据
      */
-    loadTableData: function () {
-      if (this.codeform.dataBaseName !== "") {
+    loadTableData() {
+      if (this.codeform.dbName !== "") {
         this.tableloading = true;
         var seachdata = {
           pageNum: this.pagination.pageNum,
@@ -183,46 +191,53 @@ export default {
     /**
      * 点击查询
      */
-    handleSearch: function () {
+    handleSearch() {
       this.$refs["codeform"].validate((valid) => {
         if (valid) {
           this.tableloading = true;
           this.pagination.pageNum = 1;
           this.loadTableData();
-        }else{
+        } else {
           return false;
         }
       });
     },
-    handleShowTable: function () {
-      this.pagination.pageNum = 1;
-      // this.loadTableData();
-    },
-    handleDbConn: function () {
-      var dataInfo = {
-        DbAddress: this.searchDbform.DbAddress,
-        DbPort: this.searchDbform.DbPort,
-        DbName: this.searchDbform.DbName,
-        DbUserName: this.searchDbform.DbUserName,
-        DbPassword: this.searchDbform.DbPassword,
-        DbType: this.searchDbform.DbType,
-      };
-      createGetDBConn(dataInfo).then((res) => {
-        this.selectedDataBase = res.ResData;
-        this.searchform.DbName = this.searchDbform.DbName;
-      });
+    handleShowTable() {
       this.pagination.pageNum = 1;
       this.loadTableData();
     },
+    handlePreview() {
+      this.msgSuccess("敬请期待");
+    },
+    handleShowDialog(row) {
+      console.log(row);
+      this.showGenerate = true;
+      this.currentSelected = row.name;
+
+      queryColumnInfo({
+        dbName: this.codeform.dbName,
+        tableName: row.name,
+      }).then((res) => {
+        if (res.code === 200) {
+          const columnData = res.data;
+
+          // for (let i = 0; i < columnData.length; i++) {
+          //   this.$set(columnData[i], "selectType", 1);
+          // }
+          this.columnData = columnData;
+          // this.checkedQueryColumn = res.data.map((r) => r.dbColumnName);
+        }
+      });
+    },
     /**
      * 点击生成服务端代码
      */
-    handleGenerate: async function (row) {
-      console.log(JSON.stringify(row));
-      // if (this.currentSelected.length === 0 || this.currentSelected.length > 3) {
-      //   this.msgError("请先选择要生成代码的数据表", "提示");
-      //   return false;
-      // } else {
+    handleGenerate: async function () {
+      console.log(JSON.stringify(this.checkedCodeGenerateForm));
+      if (!this.currentSelected) {
+        this.msgError("请先选择要生成代码的数据表");
+        return false;
+      }
       this.$refs["codeform"].validate((valid) => {
         if (valid) {
           var loadop = {
@@ -235,10 +250,15 @@ export default {
 
           var seachdata = {
             dbName: this.codeform.dbName,
-            tables: row.name, // this.currentSelected.toString(),
+            tables: this.currentSelected.name,
             baseSpace: this.codeform.baseSpace,
             replaceTableNameStr: this.codeform.replaceTableNameStr,
+            genFiles: this.checkedCodeGenerateForm,
+            coverd: this.coverd,
+            queryColumn: this.checkedQueryColumn,
           };
+          console.log(JSON.stringify(seachdata));
+          //return;
           codeGenerator(seachdata)
             .then((res) => {
               if (res.code == 200) {
@@ -246,7 +266,7 @@ export default {
                 //   defaultSettings.fileUrl + res.ResData[0],
                 //   res.ResData[1]
                 // );
-
+                this.showGenerate = false;
                 this.msgSuccess("恭喜你，代码生成完成！");
               } else {
                 this.msgError(res.msg);
@@ -260,14 +280,6 @@ export default {
           return false;
         }
       });
-      // }
-    },
-    /**
-     * 当用户手动勾选checkbox数据行事件
-     */
-    handleSelectChange: function (selection, row) {
-      console.log(JSON.stringify(selection));
-      this.currentSelected = selection.map((item) => item.name);
     },
     /**
      * 选择每页显示数量
@@ -284,6 +296,10 @@ export default {
       this.pagination.pageNum = val;
       this.loadTableData();
     },
+    cancel() {
+      this.showGenerate = false;
+      this.currentSelected = {};
+    },
   },
 };
 </script>
diff --git a/ZRAdmin.xml b/ZRAdmin.xml
index 521037d..fe02fe5 100644
--- a/ZRAdmin.xml
+++ b/ZRAdmin.xml
@@ -47,14 +47,19 @@
              <param name="pager">分页信息</param>
              <returns></returns>
         </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.Generate(System.String,System.String,System.String,System.String)">
+        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.QueryColumnInfo(System.String,System.String)">
+            <summary>
+            获取表格列
+            </summary>
+            <param name="dbName"></param>
+            <param name="tableName"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.Generate(ZR.CodeGenerator.Model.GenerateDto)">
             <summary>
             代码生成器
             </summary>
-            <param name="dbName"></param>
-            <param name="tables">要生成代码的表</param>
-            <param name="baseSpace">项目命名空间</param>
-            <param name="replaceTableNameStr">要删除表名的字符串用英文逗号","隔开</param>
+            <param name="dto">数据传输对象</param>
             <returns></returns>
         </member>
         <member name="M:ZR.Admin.WebApi.Controllers.HomeController.Health">