From 79d186495d76170eab70dc4e518505d0c4f7a57a Mon Sep 17 00:00:00 2001
From: izory <791736813@qq.com>
Date: Fri, 10 Sep 2021 14:01:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=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

---
 .gitignore                                   |   1 +
 README.md                                    |  13 ++-
 ZR.Admin.WebApi/appsettings.Development.json |   3 +-
 ZR.Admin.WebApi/appsettings.Production.json  |  22 ----
 ZR.Vue/src/views/tool/gen/importTable.vue    | 117 -------------------
 ZR.Vue/src/views/tool/{ => gen}/index.vue    |   3 +-
 6 files changed, 15 insertions(+), 144 deletions(-)
 delete mode 100644 ZR.Vue/src/views/tool/gen/importTable.vue
 rename ZR.Vue/src/views/tool/{ => gen}/index.vue (98%)

diff --git a/.gitignore b/.gitignore
index c516947..34b14f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -262,3 +262,4 @@ __pycache__/
 /ZRAdmin/Properties/launchSettings.json
 /ZRAdmin/Properties/PublishProfiles
 /ZR.Admin.WebApi/appsettings.Stage.json
+/CodeGenerate
diff --git a/README.md b/README.md
index b86af5e..0983811 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Vue版前端技术栈 ：基于vue、vuex、vue-router 、vue-cli 、axios 和 e
 
 日志管理：NLog、登录日志、操作日志
 
-工具类：验证码、丰富公共功能
+工具类：验证码、丰富公共功能、代码生成
 
 ## 🍄快速启动
 需要安装：VS2019（最新版）、npm或yarn（最新版）
@@ -59,6 +59,7 @@ Vue版前端技术栈 ：基于vue、vuex、vue-router 、vue-cli 、axios 和 e
 13. [X] 在线构建器：拖动表单元素生成相应的VUE代码。
 14. [X] 任务系统：基于Quartz.NET定时任务执行。
 15. [X] 文章管理：可以写文章记录。
+16. [X] 代码生成：可以一键生成前后端代码。
 
 ## 🍎演示图
 
@@ -82,7 +83,15 @@ Vue版前端技术栈 ：基于vue、vuex、vue-router 、vue-cli 、axios 和 e
 	<tr>
         <td><img src="https://www.izhaorui.cn/images/zradmin/9.png"/></td>
         <td><img src="https://www.izhaorui.cn/images/zradmin/10.png"/></td>
-    </tr>		
+    </tr>
+	<tr>
+        <td><img src="https://www.izhaorui.cn/images/zradmin/11.png"/></td>
+        <td><img src="https://www.izhaorui.cn/images/zradmin/12.png"/></td>
+    </tr>
+	<tr>
+        <td><img src="https://www.izhaorui.cn/images/zradmin/13.png"/></td>
+        <td><img src="https://www.izhaorui.cn/images/zradmin/14.png"/></td>
+    </tr>
 </table>
 
 ## 🎉优势
diff --git a/ZR.Admin.WebApi/appsettings.Development.json b/ZR.Admin.WebApi/appsettings.Development.json
index 49a30f6..8d3a082 100644
--- a/ZR.Admin.WebApi/appsettings.Development.json
+++ b/ZR.Admin.WebApi/appsettings.Development.json
@@ -7,7 +7,8 @@
     }
   },
   "ConnectionStrings": {
-    "Conn_Admin": "server=127.0.0.1;database=admin;user=zr;pwd=abc"
+    "Conn_Admin": "server=127.0.0.1;user=zr;pwd=abc;database=admin",
+    "ConnDynamic": "server=127.0.0.1;user=zr;pwd=abc;database={database}"//��������˽��
   },
   "urls": "http://localhost:8888", //����url
   "sysConfig": {
diff --git a/ZR.Admin.WebApi/appsettings.Production.json b/ZR.Admin.WebApi/appsettings.Production.json
index 8dd126d..8983e0f 100644
--- a/ZR.Admin.WebApi/appsettings.Production.json
+++ b/ZR.Admin.WebApi/appsettings.Production.json
@@ -5,27 +5,5 @@
       "Microsoft": "Warning",
       "Microsoft.Hosting.Lifetime": "Information"
     }
-  },
-  "ConnectionStrings": {
-    "Conn_Admin": "server=127.0.0.1,1433;database=admin;user=admin;pwd=abc",
-    "ConnDynamic": "server=127.0.0.1,1433;uid=dev_test;Password=%54Gz@cn;database={database}"
-  },
-  "urls": "http://localhost:8888",
-  "sysConfig": {
-    "DBCommandTimeout": 10,
-    "cors": "http://localhost:8887"
-  },
-  "DemoMode": false, //�Ƿ���ʾģʽ
-  "DbKey": "",
-  "DbType": 0, //MySql = 0, SqlServer = 1, Sqlite = 2, Oracle = 3, PostgreSQL = 4,
-  "CodeGenDbType": 0, //�����������ݿ�����
-  "Upload": {
-    "UploadDirectory": "/",
-    "UploadUrl": "http://localhost:8888"
-  },
-  "ALYUN_OCS": {
-    "REGIONID": "cn-hangzhou",
-    "KEY": "XX",
-    "SECRET": "XX"
   }
 }
diff --git a/ZR.Vue/src/views/tool/gen/importTable.vue b/ZR.Vue/src/views/tool/gen/importTable.vue
deleted file mode 100644
index 56b2c0c..0000000
--- a/ZR.Vue/src/views/tool/gen/importTable.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<template>
-  <!-- 导入表 -->
-  <el-dialog title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
-    <el-form :model="queryParams" ref="queryForm" :inline="true">
-      <el-form-item label="表名称" prop="tableName">
-        <el-input
-          v-model="queryParams.tableName"
-          placeholder="请输入表名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="表描述" prop="tableComment">
-        <el-input
-          v-model="queryParams.tableComment"
-          placeholder="请输入表描述"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <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-form-item>
-    </el-form>
-    <el-row>
-      <el-table @row-click="clickRow" ref="table" :data="dbTableList" @selection-change="handleSelectionChange" height="260px">
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column prop="tableName" label="表名称" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="tableComment" label="表描述" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="createTime" label="创建时间"></el-table-column>
-        <el-table-column prop="updateTime" label="更新时间"></el-table-column>
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </el-row>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="handleImportTable">确 定</el-button>
-      <el-button @click="visible = false">取 消</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { listDbTable, importTable } from "@/api/tool/gen";
-export default {
-  data() {
-    return {
-      // 遮罩层
-      visible: false,
-      // 选中数组值
-      tables: [],
-      // 总条数
-      total: 0,
-      // 表数据
-      dbTableList: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        tableName: undefined,
-        tableComment: undefined
-      }
-    };
-  },
-  methods: {
-    // 显示弹框
-    show() {
-      this.getList();
-      this.visible = true;
-    },
-    clickRow(row) {
-      this.$refs.table.toggleRowSelection(row);
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.tables = selection.map(item => item.tableName);
-    },
-    // 查询表数据
-    getList() {
-      listDbTable(this.queryParams).then(res => {
-        if (res.code === 200) {
-          this.dbTableList = res.rows;
-          this.total = res.total;
-        }
-      });
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 导入按钮操作 */
-    handleImportTable() {
-      importTable({ tables: this.tables.join(",") }).then(res => {
-        this.msgSuccess(res.msg);
-        if (res.code === 200) {
-          this.visible = false;
-          this.$emit("ok");
-        }
-      });
-    }
-  }
-};
-</script>
diff --git a/ZR.Vue/src/views/tool/index.vue b/ZR.Vue/src/views/tool/gen/index.vue
similarity index 98%
rename from ZR.Vue/src/views/tool/index.vue
rename to ZR.Vue/src/views/tool/gen/index.vue
index 0d4310a..a9d99b7 100644
--- a/ZR.Vue/src/views/tool/index.vue
+++ b/ZR.Vue/src/views/tool/gen/index.vue
@@ -28,13 +28,12 @@
         </el-form>
       </div>
       <el-table ref="gridtable" v-loading="tableloading" :data="tableData" border stripe highlight-current-row height="500px" 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" @click="handlePreview()">预览</el-button>
-            <el-button type="text" icon="el-icon-download" @click="handleShowDialog(scope.row)">生成代码</el-button>
+            <el-button type="text" icon="el-icon-download" @click="handleShowDialog(scope.row)" v-hasPermi="['tool:gen:code']">生成代码</el-button>
           </template>
         </el-table-column>
       </el-table>