From d740efc11d0f1dd27b7ed8f3f9908bc73f6a5a5a Mon Sep 17 00:00:00 2001
From: dolyw <1107224733@qq.com>
Date: Tue, 25 Jun 2019 16:15:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  16 +-
 .../com/example/config/DataBaseConfig.java    |   9 +-
 src/main/resources/application.yml            |   3 +-
 .../resources/config/generator.properties     |  37 +++--
 .../${className}.vue => vue/HelloWorld.vue}   |   0
 .../${moduleName}/${classNameFirstLower}.js   |  64 ++++++++
 .../${moduleName}/${classNameFirstLower}.vue  | 155 ++++++++++++++++++
 .../${classNameFirstLower}Edit.vue            | 154 +++++++++++++++++
 8 files changed, 413 insertions(+), 25 deletions(-)
 rename src/main/resources/template/two/RESTful/{resources/vue/${className}.vue => vue/HelloWorld.vue} (100%)
 create mode 100644 src/main/resources/template/two/RESTful/vue/api/${moduleName}/${classNameFirstLower}.js
 create mode 100644 src/main/resources/template/two/RESTful/vue/views/modules/${moduleName}/${classNameFirstLower}.vue
 create mode 100644 src/main/resources/template/two/RESTful/vue/views/modules/${moduleName}/${classNameFirstLower}Edit.vue

diff --git a/pom.xml b/pom.xml
index aa93d55..70a7db6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,11 +71,25 @@
             <version>1.9.21</version>
         </dependency>
 
-        <!-- Mysql-Connector -->
+        <!-- Sql-Connector -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+        <!--<dependency>
+            <groupId>oracle.jdbc</groupId>
+            <artifactId>ojdbc6</artifactId>
+            <version>0.0.1</version>
+        </dependency>-->
+        <!--<dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>sqljdbc4</artifactId>
+            <version>4.0</version>
+        </dependency>-->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
 
         <!-- Mybatis -->
         <dependency>
diff --git a/src/main/java/com/example/config/DataBaseConfig.java b/src/main/java/com/example/config/DataBaseConfig.java
index 7bd7baa..4513dda 100644
--- a/src/main/java/com/example/config/DataBaseConfig.java
+++ b/src/main/java/com/example/config/DataBaseConfig.java
@@ -42,14 +42,13 @@ public class DataBaseConfig {
     @Bean
     @Primary
     public GeneratorDao getGeneratorDao() {
-        String str = DataBaseEnum.MYSQL.getValue();
-        if(driver.indexOf(DataBaseEnum.MYSQL.getValue()) > 0) {
+        if(driver.indexOf(DataBaseEnum.MYSQL.getValue()) >= 0) {
             return mySqlGeneratorDao;
-        } else if (driver.indexOf(DataBaseEnum.ORACLE.getValue()) > 0) {
+        } else if (driver.indexOf(DataBaseEnum.ORACLE.getValue()) >= 0) {
             return oracleGeneratorDao;
-        } else if (driver.indexOf(DataBaseEnum.POSTGRESQL.getValue()) > 0) {
+        } else if (driver.indexOf(DataBaseEnum.POSTGRESQL.getValue()) >= 0) {
             return postgreSqlGeneratorDao;
-        } else if (driver.indexOf(DataBaseEnum.SQLSERVER.getValue()) > 0) {
+        } else if (driver.indexOf(DataBaseEnum.SQLSERVER.getValue()) >= 0) {
             return sqlServerGeneratorDao;
         }
         return null;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 35d4fb0..f63939b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -17,7 +17,8 @@ spring:
             minIdle: 1
             timeBetweenEvictionRunsMillis: 60000
             minEvictableIdleTimeMillis: 300000
-            validationQuery: select 'x'
+            # validationQuery: select 'x'
+            validation-query: SELECT 1 from dual
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
diff --git a/src/main/resources/config/generator.properties b/src/main/resources/config/generator.properties
index 89a5cef..b4e0fb3 100644
--- a/src/main/resources/config/generator.properties
+++ b/src/main/resources/config/generator.properties
@@ -7,28 +7,28 @@ jdbc_catalog=
 jdbc_schema=
 
 # 数据源配置(Oracle)
-#  jdbc_driver=oracle.jdbc.OracleDriver
-#  jdbc_url=jdbc:oracle:thin:@47.XX.XX.XX:XXXX:XXX
-#  jdbc_username=system
-#  jdbc_password=123456
-#  jdbc_catalog=
-#  jdbc_schema=
+# jdbc_driver=oracle.jdbc.OracleDriver
+# jdbc_url=jdbc:oracle:thin:@XXX.XX.XX.XXX:XXXX/XXXX
+# jdbc_username=XXX
+# jdbc_password=XXX
+# jdbc_catalog=
+# jdbc_schema=
 
 # 数据源配置(SqlServer)
-#  jdbc_driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
-#  jdbc_url=jdbc:sqlserver://192.168.XX.XX:XXXX;DatabaseName=XXX
-#  jdbc_username=sa
-#  jdbc_password=123456
-#  jdbc_catalog=
-#  jdbc_schema=
+# jdbc_driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
+# jdbc_url=jdbc:sqlserver://192.168.XX.XX:XXXX;DatabaseName=XXX
+# jdbc_username=sa
+# jdbc_password=123456
+# jdbc_catalog=
+# jdbc_schema=
 
 # 数据源配置(PostgreSql)
-#  jdbc_driver=org.postgresql.Driver
-#  jdbc_url=jdbc:postgresql://192.168.XX.XX:XXXX/XXX
-#  jdbc_username=postgres
-#  jdbc_password=123456
-#  jdbc_catalog=
-#  jdbc_schema=
+# jdbc_driver=org.postgresql.Driver
+# jdbc_url=jdbc:postgresql://192.168.XX.XX:XXXX/XXX
+# jdbc_username=postgres
+# jdbc_password=123456
+# jdbc_catalog=
+# jdbc_schema=
 
 # 代码生成的文件输出路径，可配置绝对路径或者当前项目相对路径
 outRoot=E:/work/outRoot
@@ -53,6 +53,7 @@ namespace=jsp
 modulepackage=generator
 # 可以继续添加属性名属性值，对应模板代码
 # XXXXX=XXXXX
+moduleName=test
 
 # 数据库列名大小写 U:大写 L:小写，不配置默认小写
 column.sqlName.caseSize=L
diff --git a/src/main/resources/template/two/RESTful/resources/vue/${className}.vue b/src/main/resources/template/two/RESTful/vue/HelloWorld.vue
similarity index 100%
rename from src/main/resources/template/two/RESTful/resources/vue/${className}.vue
rename to src/main/resources/template/two/RESTful/vue/HelloWorld.vue
diff --git a/src/main/resources/template/two/RESTful/vue/api/${moduleName}/${classNameFirstLower}.js b/src/main/resources/template/two/RESTful/vue/api/${moduleName}/${classNameFirstLower}.js
new file mode 100644
index 0000000..a0b4179
--- /dev/null
+++ b/src/main/resources/template/two/RESTful/vue/api/${moduleName}/${classNameFirstLower}.js
@@ -0,0 +1,64 @@
+<#include "/macro.include">
+<#assign className = table.className>
+<#assign classNameLower = className?uncap_first>
+import http from '@/utils/httpRequest'
+
+export const baseURL = process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.baseUrl
+
+/**
+ * 鍒楄〃鏌ヨ
+ * @param {*} searchForm
+ */
+export function list (searchForm) {
+  return http({
+    url: baseURL + '/${moduleName}/${classNameLower}',
+    method: 'get',
+    params: searchForm
+  })
+}
+
+/**
+ * 鏍规嵁Id鏌ヨ
+ * @param {*} id
+ */
+export function findById (id) {
+  return http({
+    url: baseURL + '/${moduleName}/${classNameLower}/' + id,
+    method: 'get'
+  })
+}
+
+/**
+ * 鏂板
+ * @param {*} data
+ */
+export function add (data) {
+  return http({
+    url: baseURL + '/${moduleName}/${classNameLower}',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 淇敼
+ * @param {*} data
+ */
+export function update (data) {
+  return http({
+    url: baseURL + '/${moduleName}/${classNameLower}',
+    method: 'put',
+    data
+  })
+}
+
+/**
+ * 鍒犻櫎
+ * @param {*} id
+ */
+export function delById (id) {
+  return http({
+    url: baseURL + '/${moduleName}/${classNameLower}/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/main/resources/template/two/RESTful/vue/views/modules/${moduleName}/${classNameFirstLower}.vue b/src/main/resources/template/two/RESTful/vue/views/modules/${moduleName}/${classNameFirstLower}.vue
new file mode 100644
index 0000000..e9547eb
--- /dev/null
+++ b/src/main/resources/template/two/RESTful/vue/views/modules/${moduleName}/${classNameFirstLower}.vue
@@ -0,0 +1,155 @@
+<#include "/macro.include">
+<#assign className = table.className>
+<#assign classNameLower = className?uncap_first>
+<template>
+  <div>
+    <!-- 鏌ヨ琛ㄥ崟 -->
+    <el-form :inline="true" :model="searchForm" label-width="100px" size="small">
+
+      <#list table.columns as column>
+      <el-form-item label="${column.columnAlias!}">
+        <el-input v-model.trim="searchForm.${column.columnNameLower}" placeholder="璇疯緭鍏�${column.columnAlias!}" clearable />
+      </el-form-item>
+      </#list>
+
+      <el-row type="flex">
+        <el-form-item>
+          <el-button type="primary" v-if="isAuth('${moduleName}:${classNameLower}:list')" icon="el-icon-search" @click="list(searchForm)">鏌ヨ</el-button>
+          <el-button type="primary" v-if="isAuth('${moduleName}:${classNameLower}:add')" icon="el-icon-plus" @click="preById(null)">鏂板</el-button>
+        </el-form-item>
+      </el-row>
+
+    </el-form>
+
+    <!-- 鏁版嵁琛ㄦ牸 -->
+    <el-table :data="tableData" v-loading="tableLoading" border style="width: 100%">
+
+      <#list table.columns as column>
+      <el-table-column prop="${column.columnNameLower}" label="${column.columnAlias!}" align="center" min-width="100" show-overflow-tooltip />
+      </#list>
+
+      <el-table-column label="鎿嶄綔" align="center" fixed="right" min-width="100">
+        <template slot-scope="scope">
+          <el-button type="text" v-if="isAuth('${moduleName}:${classNameLower}:update')" @click="preById(scope.row.<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list>)">缂栬緫</el-button>
+          <el-button type="text" v-if="isAuth('${moduleName}:${classNameLower}:delete')" @click="delById(scope.row.<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list>)">鍒犻櫎</el-button>
+        </template>
+      </el-table-column>
+
+    </el-table>
+
+    <div align="right" style="margin-top:10px;">
+      <el-pagination
+        :current-page="searchForm.page"
+        :page-sizes="[20, 40, 60, 80]"
+        :page-size="searchForm.rows"
+        :total="totalCount"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+
+    <!-- 寮圭獥 -->
+    <edit ref="edit" @refreshTableData="list(searchForm)"></edit>
+  </div>
+</template>
+
+<script>
+import Edit from './${classNameLower}Edit'
+import * as ${classNameLower} from '@/api/${moduleName}/${classNameLower}'
+
+export default {
+  name: '${className}',
+  data () {
+    return {
+      // 琛ㄦ牸鍔犺浇鏉℃帶鍒�
+      tableLoading: false,
+      // Table鏁版嵁
+      tableData: [],
+      // Table鏁版嵁鎬绘潯鏁�
+      totalCount: 0,
+      // 鏌ヨ琛ㄥ崟灞炴��
+      searchForm: {
+        // 褰撳墠椤�
+        page: 1,
+        // 姣忛〉鏉℃暟
+        rows: 20,
+        <#list table.columns as column>
+        '${column.columnNameLower}': null<#if column_has_next>,</#if>
+        </#list>
+      }
+    }
+  },
+  components: {
+    Edit
+  },
+  // 鍚姩鏃跺氨鎵ц
+  mounted: function () {
+
+  },
+  // 鑾峰彇娲诲姩绐楀彛
+  activated () {
+    // 鍒楄〃鏌ヨ
+    this.list(this.searchForm)
+  },
+  methods: {
+    // 姣忛〉鏉℃暟鏀瑰彉
+    handleSizeChange: function (rows) {
+      this.searchForm.rows = rows
+      // 鍒锋柊鍒楄〃
+      this.list(this.searchForm)
+    },
+    // 褰撳墠椤垫暟鏀瑰彉
+    handleCurrentChange: function (page) {
+      this.searchForm.page = page
+      // 鍒锋柊鍒楄〃
+      this.list(this.searchForm)
+    },
+    // 鍒楄〃鏌ヨ
+    list: function (searchForm) {
+      // 鍔犺浇鏄剧ず
+      this.tableLoading = true
+      ${classNameLower}.list(searchForm).then(response => {
+        const data = response.data.data
+        this.tableData = data.data
+        this.totalCount = data.count
+        // 鍔犺浇瀹屾垚
+        this.tableLoading = false
+      })
+    },
+    // 璋冪敤瀛愮粍浠剁殑preById鏂规硶
+    preById: function (<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list>) {
+      // this.$nextTick Dom娓叉煋瀹屾墽琛�
+      /* this.$nextTick(() => {
+        this.$refs.edit.preById(<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list>)
+      }) */
+      this.$refs.edit.preById(<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list>)
+    },
+    // 鍒犻櫎
+    delById: function (<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list>) {
+      this.$confirm('鏄惁纭畾鍒犻櫎锛�', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        // 纭畾鎵ц鍒犻櫎
+        ${classNameLower}.delById(<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list>).then(response => {
+          const data = response.data
+          this.$message({
+            type: 'success',
+            message: data.msg
+          })
+          // 鍒锋柊鍒楄〃
+          this.list(this.searchForm)
+        })
+      }).catch(() => {
+
+      })
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/main/resources/template/two/RESTful/vue/views/modules/${moduleName}/${classNameFirstLower}Edit.vue b/src/main/resources/template/two/RESTful/vue/views/modules/${moduleName}/${classNameFirstLower}Edit.vue
new file mode 100644
index 0000000..cde4b00
--- /dev/null
+++ b/src/main/resources/template/two/RESTful/vue/views/modules/${moduleName}/${classNameFirstLower}Edit.vue
@@ -0,0 +1,154 @@
+<#assign className = table.className>
+<#assign classNameLower = className?uncap_first>
+<#assign tableAlias = table.tableAlias>
+<template>
+  <div>
+    <!-- 寮瑰嚭妗� -->
+    <el-dialog :title="!isEdit ? '鏂板' : '淇敼'" :close-on-click-modal="false"
+        :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
+
+      <el-form v-loading="submitLoading" :model="${classNameLower}Dto" :rules="${classNameLower}DtoRules" ref="${classNameLower}Dto" label-width="100px" status-icon>
+
+        <#list table.columns as column>
+        <el-form-item label="${column.columnAlias!}" prop="${column.columnNameLower}">
+          <el-input v-model.trim="${classNameLower}Dto.${column.columnNameLower}" <#if column.pk>:disabled="!isEdit ? false : true"</#if> placeholder="璇疯緭鍏�${column.columnAlias!}"></el-input>
+        </el-form-item>
+        </#list>
+
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetForm">鍙� 娑�</el-button>
+        <el-button type="primary" @click="submitForm">鎻� 浜�</el-button>
+      </div>
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import * as ${classNameLower} from '@/api/${moduleName}/${classNameLower}'
+
+export default {
+  data () {
+    return {
+      // 鎻愪氦鎸夐挳鍔犺浇
+      submitLoading: false,
+      // 寮瑰嚭妗嗘槸鍚︽樉绀�
+      dialogVisible: false,
+      // 鏄惁淇敼
+      isEdit: false,
+      // 琛ㄥ崟鏂板缂栬緫灞炴��
+      ${classNameLower}Dto: {
+        <#list table.columns as column>
+        '${column.columnNameLower}': null<#if column_has_next>,</#if>
+        </#list>
+      },
+      // 琛ㄥ崟妫�楠岃鍒�
+      ${classNameLower}DtoRules: {
+      <#list table.columns as column>
+        ${column.columnNameLower}: [
+            { required: true, message: '璇疯緭鍏�${column.columnAlias!}', trigger: 'blur' }
+        ]<#if column_has_next>,</#if>
+      </#list>
+      }
+    }
+  },
+  // 鍚姩鏃跺氨鎵ц
+  mounted: function () {
+
+  },
+  methods: {
+    // 鎻愪氦鏂板鎴栨洿鏂�
+    submitForm () {
+      this.submitLoading = true
+      this.$refs.${classNameLower}Dto.validate((valid) => {
+        if (valid) {
+          if (this.isEdit) {
+            ${classNameLower}.update(this.${classNameLower}Dto).then(response => {
+              // 鎵ц鎴愬姛閲嶇疆琛ㄥ崟涓斿脊鍑烘彁绀轰俊鎭�
+              this.resetForm()
+              this.$message({
+                type: 'success',
+                message: response.data.msg
+              })
+            }).catch(error => {
+              console.log(error)
+            }).then(() => {
+              // always executed 绫讳技finally
+              this.submitLoading = false
+            })
+          } else {
+            ${classNameLower}.add(this.${classNameLower}Dto).then(response => {
+              // 鎵ц鎴愬姛閲嶇疆琛ㄥ崟涓斿脊鍑烘彁绀轰俊鎭�
+              this.resetForm()
+              this.$message({
+                type: 'success',
+                message: response.data.msg
+              })
+            }).catch(error => {
+              console.log(error)
+            }).then(() => {
+              // always executed 绫讳技finally
+              this.submitLoading = false
+            })
+          }
+        } else {
+          this.submitLoading = false
+          return false
+        }
+      })
+    },
+    // 閲嶇疆
+    resetForm () {
+      // 娓呯┖琛ㄥ崟
+      this.$refs.${classNameLower}Dto.resetFields()
+      // 鍏抽棴寮圭獥
+      this.dialogVisible = false
+      // 鍒锋柊鐖剁粍浠跺垪琛�
+      // this.$parent.list(this.$parent.searchForm)
+      // 鐖跺瓙缁勪欢浜嬩欢鐩戝惉鍒锋柊鐖剁粍浠跺垪琛�
+      this.$emit('refreshTableData')
+      this.submitLoading = false
+    },
+    // 鍑嗗鏂板鎴栨洿鏂�
+    preById: function (<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list>) {
+      // id涓嶄负绌烘洿鏂�
+      if (<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list>) {
+        this.submitLoading = true
+        this.${classNameLower}Dto.<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list> = <#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list>
+        ${classNameLower}.findById(<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list>).then(response => {
+          const data = response.data.data
+          this.${classNameLower}Dto = data
+        }).catch(error => {
+          console.log(error)
+        }).then(() => {
+          // always executed 绫讳技finally
+          this.submitLoading = false
+          this.isEdit = true
+        })
+      } else {
+        // id涓虹┖鏂板娓呯┖琛ㄥ崟(this.$nextTick Dom娓叉煋瀹屾墽琛�)
+        this.isEdit = false
+        this.${classNameLower}Dto.<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list> = null
+        this.$nextTick(() => {
+          this.$refs.${classNameLower}Dto.resetFields()
+        })
+      }
+      // 鏄剧ず寮瑰嚭妗�
+      this.dialogVisible = true
+    },
+    // 寮圭獥鍏抽棴浜嬩欢鏂规硶
+    handleClose (done) {
+      // 閲嶇疆琛ㄥ崟
+      this.resetForm()
+      done()
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+
+</style>
\ No newline at end of file