diff --git a/changelog.md b/changelog.md
index e3b2b9b7263774b9a2834b551020b9ba12179367..f7f54df423d0d7a12b020be7a2c9ec9cd03b7942 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,18 @@
 # changelog
 
+## 1.5.9
+
+- 支持达梦数据库 [pr](https://gitee.com/durcframework/code-gen/pulls/22)
+
+## 1.5.8
+
+- 修复oracle数据源时，生成代码页面加载不到表列表问题 [pr](https://gitee.com/durcframework/code-gen/pulls/18)  [#I4AIPV](https://gitee.com/durcframework/code-gen/issues/I4AIPV)
+
+## 1.5.7
+
+- sqlite在mac m1架构下无法运行问题。
+- 修复连接Oracle数据库生成代码时，查询字段sql报错问题
+
 ## 1.5.6
 
 - 【新增】常用变量
diff --git a/docker-build.sh b/docker-build.sh
index 909202fe7d9744efcd5e32194e598626b885827c..d41edccd1d8882ea5740fe8030a870ac3ebc2301 100644
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -8,3 +8,9 @@ sh build.sh
 
 # 创建镜像
 docker build -t tanghc2020/gen .
+
+sleep 1
+
+echo "推送到docker，命令：docker push tanghc2020/gen:latest"
+
+docker push tanghc2020/gen:latest
diff --git a/front/public/velocity/java.json b/front/public/velocity/java.json
index 7e59241fa0bc3a9a11879ae8cb414b9a8882df8c..76c2e6e462bb4e1f736e2fb8da75607f61bd235b 100644
--- a/front/public/velocity/java.json
+++ b/front/public/velocity/java.json
@@ -74,6 +74,14 @@
           "expression": "${context.javaBeanNameLF}",
           "text": "Java类名且首字母小写"
         },
+        {
+          "expression": "${context.javaBeanNameL}",
+          "text": "Java类名全部小写"
+        },
+        {
+          "expression": "${context.javaBeanNameHB}",
+          "text": "Java类名驼峰转横杠"
+        },
         {
           "expression": "${context.datetime}",
           "text": "日期时间，年月日时分秒"
diff --git a/front/src/utils/global.js b/front/src/utils/global.js
index 8f6452360cba328e6fd25cd854ea72f4b64145d0..dd374e166731287098dfadcce9bf3ba295cfa5ef 100644
--- a/front/src/utils/global.js
+++ b/front/src/utils/global.js
@@ -106,6 +106,10 @@ Object.assign(Vue.prototype, {
   goRoute: function(path) {
     this.$router.push({ path: path })
   },
+  goRouteNewWindow: function(path) {
+    let routeData = this.$router.resolve({ path: path })
+    window.open(routeData.href, '_blank');
+  },
   cellStyleSmall: function() {
     return { padding: '5px 0' }
   },
diff --git a/front/src/views/generate/GenerateConfig/index.vue b/front/src/views/generate/GenerateConfig/index.vue
index 12a447aa0d6343ee1e4fb2e9cc804c1faf163ade..a6107fc9fd77fe2fc05bf0647dba297751717e82 100644
--- a/front/src/views/generate/GenerateConfig/index.vue
+++ b/front/src/views/generate/GenerateConfig/index.vue
@@ -7,21 +7,24 @@
           placeholder="选择数据源"
           @change="onDataSourceChange"
         >
-          <el-option
-            v-for="item in datasourceConfigList"
-            :key="item.id"
-            :label="getDatasourceLabel(item)"
-            :value="item.id"
-          >
-            <span style="float: left">{{ getDatasourceLabel(item) }}</span>
-            <span style="float: right; color: #8492a6; font-size: 13px">
+          <el-option-group v-for="(datasourceConfigList,group) in datasourceGroupMap" :key="group" :label="group">
+            <el-option
+              v-for="item in datasourceConfigList"
+              :key="item.id"
+              :label="getDatasourceLabel(item)"
+              :value="item.id"
+            >
+              <span style="float: left">{{ getDatasourceLabel(item) }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">
               <el-tooltip placement="top" content="Duplicate">
                 <el-link type="primary" icon="el-icon-document-copy" style="margin-right: 20px;" @click.stop="onDataSourceDuplicate(item)"></el-link>
               </el-tooltip>
               <el-link type="primary" icon="el-icon-edit" style="margin-right: 20px;" @click.stop="onDataSourceUpdate(item)"></el-link>
               <el-link type="danger" icon="el-icon-delete" @click.stop="onDataSourceDelete(item)"></el-link>
             </span>
-          </el-option>
+            </el-option>
+          </el-option-group>
+
         </el-select>
         <el-button type="text" @click="onDataSourceAdd">新建数据源</el-button>
       </el-form-item>
@@ -68,6 +71,7 @@
         <el-select
           v-model="groupId"
           placeholder="选择模板所在组"
+          @change="onTemplateGroupChange"
           size="mini"
           style="margin-bottom: 10px; width: 100%;"
         >
@@ -81,6 +85,7 @@
           </el-option>
         </el-select>
         <el-table
+          ref="templateListSelect"
           :data="templateListData"
           border
           :cell-style="cellStyleSmall()"
@@ -102,6 +107,7 @@
           </el-table-column>
         </el-table>
         <el-button v-show="showTable" type="primary" @click="onGenerate">生成代码</el-button>
+        <el-button v-show="showTable" type="primary" @click="onGenerate('_blank')">生成代码(新窗口)</el-button>
       </el-col>
     </el-row>
 
@@ -118,6 +124,9 @@
         size="mini"
         label-width="120px"
       >
+        <el-form-item label="数据库分组" prop="dbGroupName">
+          <el-input v-model="datasourceFormData.dbGroupName" placeholder="数据库分组名称(名称自定义，可重复)" show-word-limit maxlength="64" />
+        </el-form-item>
         <el-form-item label="数据库类型">
           <el-select
             v-model="datasourceFormData.dbType"
@@ -132,6 +141,9 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="数据库描述" prop="dbDesc">
+          <el-input v-model="datasourceFormData.dbDesc" placeholder="数据库描述" show-word-limit maxlength="64" />
+        </el-form-item>
         <el-form-item label="Host" prop="host">
           <el-input v-model="datasourceFormData.host" placeholder="地址" show-word-limit maxlength="100" />
         </el-form-item>
@@ -250,15 +262,19 @@ export default {
         author: ''
       },
       tableSearch: '',
+      datasourceGroupMap: {},
       datasourceConfigList: [],
       tableListData: [],
       templateListData: [],
+      templateListSelect: [],
       // add datasource
       datasourceTitle: '新建连接',
       datasourceDlgShow: false,
       datasourceFormData: {
         id: 0,
+        dbGroupName: '',
         dbType: 1,
+        dbDesc: '',
         host: '',
         port: '',
         username: '',
@@ -383,7 +399,7 @@ export default {
     },
     getDatasourceLabel(item) {
       const schema = item.schemaName ? `/${item.schemaName}` : ''
-      return `${item.dbName}${schema} (${item.host}) - ${item.username}`
+      return `${item.dbDesc}   ${item.dbName}${schema} (${item.host}) - ${item.username}`
     },
     loadGroups() {
       this.post(`/group/list/`, {}, function(resp) {
@@ -395,6 +411,7 @@ export default {
       this.post('/datasource/list', {}, resp => {
         let id
         const list = resp.data
+        this.getDatasourceGroupMap(list)
         this.datasourceConfigList = list
         for (const item of list) {
           // 缓存id是否有效
@@ -411,6 +428,15 @@ export default {
         }
       })
     },
+    getDatasourceGroupMap(list) {
+      const groups = {}
+      for (const item of list) {
+        let groupName = item.dbGroupName || '';
+        groups[groupName] = groups[groupName] || []
+        groups[groupName].push(item)
+      }
+      this.datasourceGroupMap = groups
+    },
     loadTemplate() {
       this.post('/template/list', {}, resp => {
         this.templateListData = resp.data
@@ -480,6 +506,10 @@ export default {
         }
       })
     },
+    onTemplateGroupChange(templateId) {
+      //切换模板下拉框  清除先前被选中的模板
+      this.$refs.templateListSelect.clearSelection();
+    },
     onTableListSelect(selectedRows) {
       this.clientParam.tableNames = selectedRows
         .filter(row => row.hidden === undefined || row.hidden === false)
@@ -521,7 +551,7 @@ export default {
         })
       })
     },
-    onGenerate() {
+    onGenerate(target) {
       this.$refs.genForm.validate((valid) => {
         if (valid) {
           if (this.clientParam.tableNames.length === 0) {
@@ -533,7 +563,13 @@ export default {
             return
           }
           const config = JSON.stringify(this.clientParam)
-          this.goRoute(`result/${config}`)
+          console.log(target);
+          if (target === '_blank') {
+            //新窗口打开
+            this.goRouteNewWindow(`result/${config}`)
+          }else{
+            this.goRoute(`result/${config}`)
+          }
         }
       })
     },
diff --git a/front/src/views/generate/result.vue b/front/src/views/generate/result.vue
index bbc1651a0718a68b5a8f927d12594bcb4fb8cb42..eb721f82ddb07816a0cfc53065e6cabf0fff9697 100644
--- a/front/src/views/generate/result.vue
+++ b/front/src/views/generate/result.vue
@@ -203,8 +203,9 @@ export default {
         const children = row.children
         const isFolder = children.length > 0
         if (isFolder) {
-          // 创建文件夹
-          const folderZip = zip.folder(row.fileName)
+          // 创建文件夹 将文件层级的点 改为 路径 斜杠
+          let folderName = row.fileName.replaceAll('.','/');
+          const folderZip = zip.folder(folderName)
           children.forEach(child => {
             // 文件放入文件夹中
             folderZip.file(child.fileName, child.content)
diff --git a/front/src/views/template/edit.vue b/front/src/views/template/edit.vue
index 0b1cd0a38a750c3785e3681046ab30cb3b652d53..a0685180fac7e4628ac1ea5af80c2519d9f78996 100644
--- a/front/src/views/template/edit.vue
+++ b/front/src/views/template/edit.vue
@@ -40,7 +40,14 @@
             <el-input v-model="formData.fileName" placeholder="可使用velocity变量" show-word-limit maxlength="100" />
           </el-form-item>
           <el-form-item prop="content" label="模板内容">
-            <el-link type="primary" :underline="false" href="https://www.cnblogs.com/codingsilence/archive/2011/03/29/2146580.html" target="_blank">Velocity语法</el-link>
+            <el-row :gutter="20">
+              <el-col :span="6">
+                <el-link type="primary" :underline="false" href="https://www.cnblogs.com/codingsilence/archive/2011/03/29/2146580.html" target="_blank">Velocity语法</el-link>
+              </el-col>
+              <el-col :span="12" :offset="6">
+                <div>[代码样式：<el-button v-for="item in codeThemeList" type="text" @click="changeCodeTheme(item)">{{ item }}</el-button>]</div>
+              </el-col>
+            </el-row>
             <codemirror
               ref="editor"
               v-model="formData.content"
@@ -77,6 +84,15 @@
           </div>
         </div>
       </el-col>
+
+      <el-col :span="8">
+        <h4 style="margin: 10px 0">
+          快捷键
+        </h4>
+        <div v-for="item in shortcutKeyList" style="padding: 5px">
+          <el-tag size="small">{{ item }}</el-tag>
+        </div>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -114,14 +130,39 @@
 
 <script>
 import { codemirror } from 'vue-codemirror'
+
 import 'codemirror/theme/neat.css'
+import "codemirror/theme/darcula.css";
+import "codemirror/theme/material.css";
+
+/** 搜索 替换框置顶*/
+import 'codemirror/addon/scroll/annotatescrollbar.js'
+import 'codemirror/addon/search/matchesonscrollbar.js'
+import 'codemirror/addon/search/match-highlighter.js'
+import 'codemirror/addon/search/jump-to-line.js'
+
+import 'codemirror/addon/dialog/dialog.js'
+import 'codemirror/addon/dialog/dialog.css'
+import 'codemirror/addon/search/searchcursor.js'
+import 'codemirror/addon/search/search.js'
 
 require('codemirror/mode/velocity/velocity')
+
+const TEMPLATE_CODE_THEME = 'gen.template.code.theme'
+
 export default {
   components: { codemirror },
   data() {
     return {
       groupData: [],
+      codeThemeList: ['neat', 'darcula','material'],
+      shortcutKeyList: [
+        '保存：Ctrl+S',
+        '删除当行：Ctrl+D',
+        '复制当行：Ctrl+C',
+        '剪切当行：Ctrl+X',
+        '替换：Ctrl+Shift+F'
+      ],
       formData: {
         id: 0,
         groupId: '',
@@ -145,6 +186,7 @@ export default {
           { required: true, message: '不能为空', trigger: 'blur' }
         ]
       },
+      //code mirror配置
       cmOptions: {
         value: '',
         mode: 'text/velocity',
@@ -174,11 +216,28 @@ export default {
     }
     this.loadVelocityVar()
     this.loadGroups(this.$route.query.groupId)
+    //初始化代码主题
+    this.cmOptions.theme = this.getAttr(TEMPLATE_CODE_THEME) || 'neat'
   },
   mounted() {
     window.addEventListener('scroll', this.handlerScroll)
+    this.watchKeydown()
   },
   methods: {
+    watchKeydown(){
+      let _this = this;
+      document.onkeydown = function(e) {
+        let key = window.event.keyCode;
+        if (key== 83 && event.ctrlKey) {//s == 83 && event.ctrlKey
+          window.event.preventDefault() //关闭浏览器快捷键
+          _this.onSave();
+        }
+        if (event.ctrlKey && key == 82) {
+          window.event.preventDefault() //关闭浏览器快捷键
+        }
+
+      };
+    },
     handlerScroll() {
       const scrollTop = window.pageYOffset ||
         document.documentElement.scrollTop ||
@@ -240,6 +299,10 @@ export default {
     onTabClick(tab) {
       const item = tab.$attrs.content
       this.treeData = item.data
+    },
+    changeCodeTheme(theme){
+      this.cmOptions.theme = theme
+      this.setAttr(TEMPLATE_CODE_THEME,theme)
     }
   }
 }
diff --git a/front/src/views/template/index.vue b/front/src/views/template/index.vue
index 7894eb19e8d9353c08d7f4b5fa0a32108c16a990..f70fc35bb32f959b3a811bbe5515f9c28e403e35 100644
--- a/front/src/views/template/index.vue
+++ b/front/src/views/template/index.vue
@@ -46,6 +46,7 @@
         >
           <template slot-scope="scope">
             <el-button type="text" size="mini" @click="onTableUpdate(scope.row)">修改</el-button>
+            <el-button type="text" size="mini" @click="onTableCopy(scope.row)">复制</el-button>
             <el-button type="text" size="mini" @click="onTableDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
@@ -132,6 +133,28 @@ export default {
     onTableUpdate: function(row) {
       this.goRoute(`edit/${row.id}`)
     },
+    onTableCopy: function (row) {
+      let currentGroup = this.currentTab;
+      this.groupTitle = `确认要复制【${row.name}】吗？`
+      this.$prompt('请输入复制后的模板名称', '复制模板', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputValue: '',
+        inputPattern: /^.{1,64}$/,
+        inputErrorMessage: '不能为空且长度在64以内'
+      }).then(({value}) => {
+        const data = {
+          name: value,
+          id: row.id,
+          groupName: currentGroup.groupName,
+          groupId: currentGroup.groupId
+        }
+        this.post('/template/copy', data, resp => {
+          this.reload()
+        })
+      }).catch(() => {
+      })
+    },
     onTableDelete: function(row) {
       this.confirm(`确认要删除【${row.name}】吗？`, function(done) {
         this.post('/template/del', row, function() {
diff --git a/gen/pom.xml b/gen/pom.xml
index 317174314171a1f5036cab70b70baac667cd4b92..dedb0d54a55fd35a399aedc1e72c0c5fad68aaa8 100644
--- a/gen/pom.xml
+++ b/gen/pom.xml
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.21.0.1</version>
+            <version>3.34.0</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -70,9 +70,9 @@
         </dependency>
         <!-- 达梦 -->
         <dependency>
-            <groupId>com.dm</groupId>
-            <artifactId>DmJdbcDriver</artifactId>
-            <version>18</version>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+            <version>8.1.2.141</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
diff --git a/gen/src/main/java/com/gitee/gen/controller/TemplateConfigController.java b/gen/src/main/java/com/gitee/gen/controller/TemplateConfigController.java
index 984d34968aeafcca37b774b4107dd0007a4777e3..f5e07d28b9fa174268051b79533ec610964809dc 100644
--- a/gen/src/main/java/com/gitee/gen/controller/TemplateConfigController.java
+++ b/gen/src/main/java/com/gitee/gen/controller/TemplateConfigController.java
@@ -82,4 +82,10 @@ public class TemplateConfigController {
         return Action.ok();
     }
 
+    @RequestMapping("/copy")
+    public Result copy(@RequestBody TemplateConfig templateConfig) {
+        templateConfigService.copy(templateConfig);
+        return Action.ok();
+    }
+
 }
diff --git a/gen/src/main/java/com/gitee/gen/entity/DatasourceConfig.java b/gen/src/main/java/com/gitee/gen/entity/DatasourceConfig.java
index e21ee754ea17f641057c73a03091b99bc32bc10a..ae381da4e5b29b136bdd74b4eedd1bffda88fe5d 100644
--- a/gen/src/main/java/com/gitee/gen/entity/DatasourceConfig.java
+++ b/gen/src/main/java/com/gitee/gen/entity/DatasourceConfig.java
@@ -15,6 +15,8 @@ public class DatasourceConfig {
     private Integer dbType;
     /** 数据库驱动 */
     private String driverClass;
+    /** 数据库别名 */
+    private String dbDesc;
     /** 数据库名称 */
     private String dbName;
     /** schema(PGSQL专用) */
@@ -37,6 +39,8 @@ public class DatasourceConfig {
     private Integer groupId;
     /** 作者名*/
     private String author;
+    /** 数据库分组名称 */
+    private String dbGroupName;
 
     public Integer getId() {
         return id;
@@ -150,12 +154,29 @@ public class DatasourceConfig {
         this.author = author;
     }
 
+    public String getDbDesc() {
+        return dbDesc;
+    }
+
+    public void setDbDesc(String dbDesc) {
+        this.dbDesc = dbDesc;
+    }
+
+    public String getDbGroupName() {
+        return dbGroupName;
+    }
+
+    public void setDbGroupName(String dbGroupName) {
+        this.dbGroupName = dbGroupName;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         DatasourceConfig that = (DatasourceConfig) o;
         return Objects.equals(id, that.id) &&
+                Objects.equals(dbDesc, that.dbDesc) &&
                 Objects.equals(dbType, that.dbType) &&
                 Objects.equals(driverClass, that.driverClass) &&
                 Objects.equals(dbName, that.dbName) &&
@@ -167,12 +188,13 @@ public class DatasourceConfig {
                 Objects.equals(packageName, that.packageName) &&
                 Objects.equals(delPrefix, that.delPrefix) &&
                 Objects.equals(groupId, that.groupId) &&
-                Objects.equals(author, that.author);
+                Objects.equals(author, that.author) &&
+                Objects.equals(dbGroupName, that.dbGroupName);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, dbType, driverClass, dbName, host, port, username, password, isDeleted, packageName, delPrefix, groupId, author);
+        return Objects.hash(id, dbType, dbDesc, driverClass, dbName, host, port, username, password, isDeleted, packageName, delPrefix, groupId, author, dbGroupName);
     }
 
     @Override
@@ -180,6 +202,7 @@ public class DatasourceConfig {
         return "DatasourceConfig{" +
                 "id=" + id +
                 ", dbType=" + dbType +
+                ", dbDesc=" + dbDesc +
                 ", driverClass='" + driverClass + '\'' +
                 ", dbName='" + dbName + '\'' +
                 ", host='" + host + '\'' +
@@ -191,6 +214,7 @@ public class DatasourceConfig {
                 ", delPrefix='" + delPrefix + '\'' +
                 ", groupId='" + groupId + '\'' +
                 ", author='" + author + '\'' +
+                ", dbGroupName='" + dbGroupName + '\'' +
                 '}';
     }
 }
\ No newline at end of file
diff --git a/gen/src/main/java/com/gitee/gen/gen/SQLContext.java b/gen/src/main/java/com/gitee/gen/gen/SQLContext.java
index 65adb560d066366b689d3d9c8ef7b0bbdd86db01..cabef7c039df4db67bbd43b7537db493b87d7661 100644
--- a/gen/src/main/java/com/gitee/gen/gen/SQLContext.java
+++ b/gen/src/main/java/com/gitee/gen/gen/SQLContext.java
@@ -31,6 +31,11 @@ public class SQLContext {
      */
     private String packageName;
 
+    /**
+     * 包的子路径
+     */
+    private String packageSubPath;
+
     /**
      * 删除的前缀
      */
@@ -122,6 +127,34 @@ public class SQLContext {
         return FieldUtil.lowerFirstLetter(tableName);
     }
 
+    /**
+     * 返回Java类名全小写
+     *
+     * @return
+     */
+    public String getJavaBeanNameL() {
+        return getJavaBeanNameLF().toLowerCase();
+    }
+
+    /**
+     * 返回Java类名驼峰转横杠
+     *
+     * @return
+     */
+    public String getJavaBeanNameHB() {
+        String tableName = tableDefinition.getTableName();
+        if(delPrefix != null){
+            String[] split = delPrefix.split("\\s*,\\s*");
+            for (String prefix : split){
+                tableName = StringUtils.removeStart(tableName, prefix);
+            }
+        }
+
+        tableName = tableName.replace("_","-");
+        tableName = FieldUtil.dotFilter(tableName);
+        return tableName;
+    }
+
     public String getPkName() {
         if (javaPkColumn != null) {
             return javaPkColumn.getColumnName();
@@ -185,4 +218,12 @@ public class SQLContext {
     public void setAuthor(String author) {
         this.author = author;
     }
+
+    public String getPackageSubPath() {
+        return packageSubPath;
+    }
+
+    public void setPackageSubPath(String packageSubPath) {
+        this.packageSubPath = packageSubPath;
+    }
 }
diff --git a/gen/src/main/java/com/gitee/gen/gen/oracle/OracleColumnSelector.java b/gen/src/main/java/com/gitee/gen/gen/oracle/OracleColumnSelector.java
index d43a9cc3d10da52790a75c3bccd827a22e4d164f..3092bac938f89df93163cb8ef567c438efa026ab 100644
--- a/gen/src/main/java/com/gitee/gen/gen/oracle/OracleColumnSelector.java
+++ b/gen/src/main/java/com/gitee/gen/gen/oracle/OracleColumnSelector.java
@@ -40,7 +40,7 @@ public class OracleColumnSelector extends ColumnSelector {
 
 	private static final String COLUMN_SQL = " SELECT " +
 			" atc.COLUMN_NAME FIELD, atc.DATA_TYPE TYPE, atc.DATA_SCALE SCALE, atc.DATA_LENGTH MAXLENGTH, " +
-			" CASE atc.NULLABLE NULLABLE , " +
+			" atc.NULLABLE NULLABLE , " +
 			" atc.DATA_DEFAULT 默认值, acc.COMMENTS COMMENTS, atc.TABLE_NAME 表名, " +
 			" CASE atc.COLUMN_NAME " +
 			" WHEN " +
@@ -48,7 +48,7 @@ public class OracleColumnSelector extends ColumnSelector {
 			"	LEFT JOIN all_cons_columns col ON con.table_name = col.table_name " +
 			"	AND con.OWNER = col.OWNER AND con.CONSTRAINT_NAME = col.CONSTRAINT_NAME " +
 			"   WHERE con.constraint_type = 'P' " +
-			"	AND col.table_name = '%s' AND con.OWNER = '%s' ) " +
+			"	AND col.table_name = '%s' AND con.OWNER = '%s' AND col.column_name = atc.COLUMN_NAME ) " +
 			" THEN 'true' ELSE 'false' END AS KEY " +
 			" FROM ALL_TAB_COLUMNS atc " +
 			" LEFT JOIN ALL_COL_COMMENTS acc " +
diff --git a/gen/src/main/java/com/gitee/gen/gen/oracle/OracleTableSelector.java b/gen/src/main/java/com/gitee/gen/gen/oracle/OracleTableSelector.java
index 67a0be1d744fb4036ba3e5080daac4a06555966f..223d36fd18dff480ee2f0c786f6a43ef7b5a86d3 100644
--- a/gen/src/main/java/com/gitee/gen/gen/oracle/OracleTableSelector.java
+++ b/gen/src/main/java/com/gitee/gen/gen/oracle/OracleTableSelector.java
@@ -10,7 +10,7 @@ import java.util.Map;
 import static com.gitee.gen.util.FieldUtil.convertString;
 
 /**
- * 查询mysql数据库表
+ * 查询oracle数据库表
  */
 public class OracleTableSelector extends TableSelector {
 
diff --git a/gen/src/main/java/com/gitee/gen/service/GeneratorService.java b/gen/src/main/java/com/gitee/gen/service/GeneratorService.java
index bd07cf6b8880255dea91c46d0a6a1170255808aa..4b1bb1fc1f8576f97462a10bb68bfe35c28ef55e 100644
--- a/gen/src/main/java/com/gitee/gen/service/GeneratorService.java
+++ b/gen/src/main/java/com/gitee/gen/service/GeneratorService.java
@@ -62,7 +62,14 @@ public class GeneratorService {
                 String folder = template.getFolder();
                 if (StringUtils.isEmpty(folder)) {
                     folder = template.getName();
+                }else{
+                    //文件目录可以使用变量
+                    folder = doGenerator(sqlContext, folder);
                 }
+
+                setFolder(sqlContext, folder);
+
+                //获取文件名
                 String fileName = doGenerator(sqlContext, template.getFileName());
                 String content = doGenerator(sqlContext, template.getContent());
                 content = this.formatCode(fileName, content);
@@ -123,6 +130,12 @@ public class GeneratorService {
         }
     }
 
+    private void setFolder(SQLContext sqlContext, String folder) {
+        if (StringUtils.hasText(folder)) {
+            sqlContext.setPackageSubPath(folder);
+        }
+    }
+
     private void setDelPrefix(SQLContext sqlContext, String delPrefix) {
         if (StringUtils.hasText(delPrefix)) {
             sqlContext.setDelPrefix(delPrefix);
diff --git a/gen/src/main/java/com/gitee/gen/service/TemplateConfigService.java b/gen/src/main/java/com/gitee/gen/service/TemplateConfigService.java
index 956cd634ff55770b04c71584eda7c4e75cc6c8d9..8c1529e90c5d5d6b6aeb376cacb40e3e252c8867 100644
--- a/gen/src/main/java/com/gitee/gen/service/TemplateConfigService.java
+++ b/gen/src/main/java/com/gitee/gen/service/TemplateConfigService.java
@@ -76,6 +76,21 @@ public class TemplateConfigService {
         }
     }
 
+    /**
+     * 复制模板
+     * @param templateConfig
+     */
+    public void copy(TemplateConfig templateConfig) {
+        Integer id = templateConfig.getId();
+        TemplateConfig templateConfigById = this.getById(id);
+        if(templateConfigById == null){
+            throw new RuntimeException("要复制的模板不存在");
+        }
+        templateConfigById.setId(null);
+        templateConfigById.setName(templateConfig.getName());
+        this.save(templateConfigById);
+    }
+
     /**
      * 解析模板元信息, 即开始第一行是注释时
      * <p>
diff --git a/gen/src/main/resources/gen.db b/gen/src/main/resources/gen.db
index ca3318427aeb2d7088c6259a0fca21808d002214..932ec39230ab5bd4030e4993a5ef8623854662de 100644
Binary files a/gen/src/main/resources/gen.db and b/gen/src/main/resources/gen.db differ
diff --git a/gen/src/main/resources/mybatis/DatasourceConfigMapper.xml b/gen/src/main/resources/mybatis/DatasourceConfigMapper.xml
index 7afe169eb3d4de766c4b45501f47d933f467563d..0e96a7f3d35eef4e961d9b86fabd0b493ddf8d95 100644
--- a/gen/src/main/resources/mybatis/DatasourceConfigMapper.xml
+++ b/gen/src/main/resources/mybatis/DatasourceConfigMapper.xml
@@ -4,6 +4,7 @@
     <resultMap id="BaseResultMap" type="com.gitee.gen.entity.DatasourceConfig">
         <result column="id" property="id" />
         <result column="db_type" property="dbType" />
+        <result column="db_desc" property="dbDesc" />
         <result column="driver_class" property="driverClass" />
         <result column="db_name" property="dbName" />
         <result column="schema_name" property="schemaName" />
@@ -16,12 +17,14 @@
         <result column="del_prefix" property="delPrefix" />
         <result column="group_id" property="groupId" />
         <result column="author" property="author" />
+        <result column="db_group_name" property="dbGroupName" />
     </resultMap>
 
     <!-- 表字段 -->
     <sql id="baseColumns">
          t.id
         , t.db_type
+        , t.db_desc
         , t.driver_class
         , t.db_name
         , t.schema_name
@@ -34,6 +37,7 @@
         , t.del_prefix
         , t.group_id
         , t.author
+        , t.db_group_name
         </sql>
 
     <!-- 查询全部 -->
@@ -59,6 +63,7 @@
         INSERT INTO datasource_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
             db_type,
+            db_desc,
             driver_class,
             db_name,
             schema_name,
@@ -71,9 +76,11 @@
             del_prefix,
             group_id,
             author,
+            db_group_name,
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             #{dbType},
+            #{dbDesc},
             #{driverClass},
             #{dbName},
             #{schemaName},
@@ -86,6 +93,7 @@
             #{delPrefix},
             #{groupId},
             #{author},
+            #{dbGroupName},
         </trim>
     </insert>
 
@@ -99,6 +107,9 @@
             <if test="dbType != null">
                 db_type,
             </if>
+            <if test="dbDesc != null">
+                db_desc,
+            </if>
             <if test="driverClass != null">
                 driver_class,
             </if>
@@ -135,11 +146,17 @@
             <if test="author != null">
                 author,
             </if>
+            <if test="dbGroupName != null">
+                db_group_name,
+            </if>
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             <if test="dbType != null" >
                 #{dbType},
             </if>
+            <if test="dbDesc != null" >
+                #{dbDesc},
+            </if>
             <if test="driverClass != null" >
                 #{driverClass},
             </if>
@@ -176,6 +193,9 @@
             <if test="author != null" >
                 #{author},
             </if>
+            <if test="dbGroupName != null" >
+                #{dbGroupName},
+            </if>
         </trim>
     </insert>
 
@@ -184,6 +204,7 @@
         UPDATE datasource_config
         <set>
             db_type=#{dbType},
+            db_desc=#{dbDesc},
             driver_class=#{driverClass},
             db_name=#{dbName},
             schema_name=#{schemaName},
@@ -196,6 +217,7 @@
             del_prefix=#{delPrefix},
             group_id=#{groupId},
             author=#{author},
+            db_group_name=#{dbGroupName},
         </set>
         WHERE id = #{id}
     </update>
@@ -208,6 +230,9 @@
             <if test="dbType != null" >
                 db_type=#{dbType},
             </if>
+            <if test="dbDesc != null" >
+                db_desc=#{dbDesc},
+            </if>
             <if test="driverClass != null" >
                 driver_class=#{driverClass},
             </if>
@@ -244,6 +269,9 @@
             <if test="author != null" >
                 author=#{author},
             </if>
+            <if test="dbGroupName != null" >
+                db_group_name=#{dbGroupName},
+            </if>
         </set>
         WHERE id = #{id}
     </update>
diff --git a/script/startup.bat b/script/startup.bat
new file mode 100644
index 0000000000000000000000000000000000000000..11a8499a90d70bb17950226610b0ec43cb7973c0
--- /dev/null
+++ b/script/startup.bat
@@ -0,0 +1,5 @@
+@echo off
+
+set app_name=gen
+
+java -Duser.timezone=Asia/Shanghai -jar -Xms128m -Xmx128m %app_name%.jar
\ No newline at end of file
diff --git a/templates/fastmybatis-v2.0/columns.vm b/templates/fastmybatis-v2.0/columns.vm
new file mode 100644
index 0000000000000000000000000000000000000000..fc8832da8c0d1a79c66167672f023141d3935ae8
--- /dev/null
+++ b/templates/fastmybatis-v2.0/columns.vm
@@ -0,0 +1,19 @@
+## filename=${context.javaBeanName}Columns, folder=columns
+/**
+ * ${table.tableName}表字段映射关系<br>
+ * 使用方式：
+ * <pre>
+ * {@literal
+ * Query query = new Query().eq(TUserColumns.id, 6);
+ * TUser tUser = mapper.getBySpecifiedColumns(Arrays.asList(TUserColumns.id, TUserColumns.username), query);
+ * }
+ * </pre>
+ * @author xxx
+ */
+public interface ${context.javaBeanName}Columns {
+#foreach($column in $columns)
+	/** ${column.comment} */
+	String ${column.columnName} = "${column.columnName}";
+    
+#end
+}
\ No newline at end of file
diff --git a/templates/fastmybatis-v2.0/controller.vm b/templates/fastmybatis-v2.0/controller.vm
new file mode 100644
index 0000000000000000000000000000000000000000..59dcd1ad5e17c86e9497de4d5e9711c844dc6bb7
--- /dev/null
+++ b/templates/fastmybatis-v2.0/controller.vm
@@ -0,0 +1,78 @@
+## filename=${context.javaBeanName}Controller.java, folder=controller
+package ${context.packageName}.web.controller;
+
+import com.gitee.fastmybatis.core.PageInfo;
+import com.gitee.fastmybatis.core.query.Query;
+import com.gitee.fastmybatis.core.query.param.PageParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import ${context.packageName}.dao.entity.${context.javaBeanName};
+import ${context.packageName}.service.${context.javaBeanName}Service;
+
+/**
+ * @author xxx
+ */
+@RestController
+@RequestMapping("${table.tableName}")
+public class ${context.javaBeanName}Controller {
+
+    @Autowired
+    private ${context.javaBeanName}Service ${context.javaBeanNameLF}Service;
+
+    /**
+     * 分页查询
+     *
+     * @param param
+     * @return
+     */
+    @GetMapping("/page")
+    public Result<PageInfo<${context.javaBeanName}>> page(PageParam param) {
+        Query query = param.toQuery();
+        PageInfo<${context.javaBeanName}> pageInfo = ${context.javaBeanNameLF}Service.page(query);
+        return Result.ok(pageInfo);
+    }
+    
+    /**
+     * 新增记录
+     *
+     * @param user
+     * @return
+     */
+    @PostMapping("/save")
+    public Result<${pk.javaTypeBox}> save(${context.javaBeanName} user) {
+        ${context.javaBeanNameLF}Service.saveIgnoreNull(user);
+        // 返回添加后的主键值
+        return Result.ok(user.getId());
+    }
+    
+    /**
+     * 修改记录
+     *
+     * @param user 表单数据
+     * @return
+     */
+    @PutMapping("/update")
+    public Result<?> update(${context.javaBeanName} user) {
+        ${context.javaBeanNameLF}Service.updateIgnoreNull(user);
+        return Result.ok();
+    }
+     
+    /**
+     * 删除记录
+     *
+     * @param id 主键id
+     * @return
+     */
+    @DeleteMapping("/delete")
+    public Result<?> delete(${pk.javaTypeBox} id) {
+        ${context.javaBeanNameLF}Service.deleteById(id);
+        return Result.ok();
+    }
+    
+}
\ No newline at end of file
diff --git a/templates/fastmybatis-v2.0/entity.vm b/templates/fastmybatis-v2.0/entity.vm
new file mode 100644
index 0000000000000000000000000000000000000000..2be70a37b4d85091bf53816805261697a0a44a07
--- /dev/null
+++ b/templates/fastmybatis-v2.0/entity.vm
@@ -0,0 +1,45 @@
+## filename=${context.javaBeanName}.java, folder=entity
+package ${context.packageName}.dao.entity;
+
+#if(${table.hasDateField})
+import java.util.Date;
+#end
+#if(${table.hasLocalDateField})
+import java.time.LocalDate;
+#end
+#if(${table.hasLocalDateTimeField})
+import java.time.LocalDateTime;
+#end
+#if(${table.hasBigDecimalField})
+import java.math.BigDecimal;
+#end
+
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.PkStrategy;
+import com.gitee.fastmybatis.annotation.Table;
+
+import lombok.Data;
+
+
+/**
+ * 表名：${table.tableName}
+#if("$!{table.comment}" != "")
+ * 备注：${table.comment}
+#end
+ *
+ * @author xxx
+ */
+@Table(name = "${table.tableName}", pk = @Pk(name = "${pk.columnName}", strategy = PkStrategy.INCREMENT))
+@Data
+public class ${context.javaBeanName} {
+
+#foreach($column in $columns)
+    /** #if("$!{column.comment}" != "")${column.comment},#end 数据库字段：${column.columnName} */
+#if(${column.columnName} == "is_deleted")
+    @com.gitee.fastmybatis.annotation.Column(logicDelete = true)
+#end
+    private ${column.javaTypeBox} ${column.javaFieldName};
+
+#end
+
+}
\ No newline at end of file
diff --git a/templates/fastmybatis-v2.0/mapper.vm b/templates/fastmybatis-v2.0/mapper.vm
new file mode 100644
index 0000000000000000000000000000000000000000..b212933a44c5b3fcb5bcf17003ce1bf9b3d99cc6
--- /dev/null
+++ b/templates/fastmybatis-v2.0/mapper.vm
@@ -0,0 +1,12 @@
+## filename=${context.javaBeanName}Mapper.java, folder=mapper
+package ${context.packageName}.dao.mapper;
+
+import com.gitee.fastmybatis.core.mapper.CrudMapper;
+import ${context.packageName}.dao.entity.${context.javaBeanName};
+
+/**
+ * @author xxx
+ */
+public interface ${context.javaBeanName}Mapper extends CrudMapper<${context.javaBeanName}, ${pk.javaTypeBox}> {
+	
+}
\ No newline at end of file
diff --git a/templates/fastmybatis-v2.0/service.vm b/templates/fastmybatis-v2.0/service.vm
new file mode 100644
index 0000000000000000000000000000000000000000..bbbc8c9f84f98a56bc98722162840ce8f447fd46
--- /dev/null
+++ b/templates/fastmybatis-v2.0/service.vm
@@ -0,0 +1,16 @@
+## filename=${context.javaBeanName}Service.java, folder=service
+package ${context.packageName}.mapper;
+
+import com.gitee.fastmybatis.core.support.IService;
+import ${context.packageName}.dao.entity.${context.javaBeanName};
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author xxx
+ */
+@Service
+public class ${context.javaBeanName}Service implements IService<${context.javaBeanName}, ${pk.javaTypeBox}> {
+
+}
\ No newline at end of file