From 259d97115510925dd2742b1e28b5a68bd15d8d04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Thu, 23 Apr 2020 22:02:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?:rewind:=20Reverting=20changes.=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=9B=9E=E6=BB=9A=EF=BC=8C=E4=BF=AE=E5=A4=8D=20?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E4=B8=A2=E5=A4=B1=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/template/avue/index.vue.vm            | 4 ++--
 .../src/main/resources/template/element/form.vue.vm          | 2 +-
 .../src/main/resources/template/element/index.vue.vm         | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/avue/index.vue.vm b/pigx-visual/pigx-codegen/src/main/resources/template/avue/index.vue.vm
index 3b16b934e..6c46c9ab1 100755
--- a/pigx-visual/pigx-codegen/src/main/resources/template/avue/index.vue.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/avue/index.vue.vm
@@ -37,8 +37,8 @@
 </template>
 
 <script>
-    import {addObj, delObj, fetchList, putObj} from '@/api/'
-    import {tableOption} from '@/const/crud/'
+    import {fetchList, getObj, addObj, putObj, delObj} from '@/api/${pathName}'
+    import {tableOption} from '@/const/crud/${pathName}'
     import {mapGetters} from 'vuex'
 
     export default {
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/element/form.vue.vm b/pigx-visual/pigx-codegen/src/main/resources/template/element/form.vue.vm
index a5f7657d1..bef510cdb 100644
--- a/pigx-visual/pigx-codegen/src/main/resources/template/element/form.vue.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/element/form.vue.vm
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-    import {addObj, getObj, putObj} from '@/api/'
+    import {getObj, addObj, putObj} from '@/api/${pathName}'
 
     export default {
     data () {
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/element/index.vue.vm b/pigx-visual/pigx-codegen/src/main/resources/template/element/index.vue.vm
index b990d3093..b757d6de5 100644
--- a/pigx-visual/pigx-codegen/src/main/resources/template/element/index.vue.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/element/index.vue.vm
@@ -51,10 +51,9 @@
 </template>
 
 <script>
-  import {delObj, fetchList} from '@/api/'
-  import TableForm from './'
+  import {fetchList, delObj} from '@/api/${pathName}'
+  import TableForm from './${pathName}-form'
   import {mapGetters} from 'vuex'
-
   export default {
     data () {
       return {

From 9aee7740f6414329c04bdff880ad286249615421 Mon Sep 17 00:00:00 2001
From: xiaohan815 <403673749@qq.com>
Date: Mon, 27 Apr 2020 12:09:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?checkDataSource=E4=B9=8B=E5=90=8E=E5=85=B3?=
 =?UTF-8?q?=E9=97=ADconnection?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GenDatasourceConfServiceImpl.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenDatasourceConfServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenDatasourceConfServiceImpl.java
index 3eae2701c..a1ac26bff 100755
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenDatasourceConfServiceImpl.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenDatasourceConfServiceImpl.java
@@ -30,6 +30,7 @@ import org.jasypt.encryption.StringEncryptor;
 import org.springframework.stereotype.Service;
 
 import javax.sql.DataSource;
+import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
@@ -134,11 +135,18 @@ public class GenDatasourceConfServiceImpl extends ServiceImpl<GenDatasourceConfM
 	 */
 	@Override
 	public Boolean checkDataSource(GenDatasourceConf conf) {
+		Connection connection =null;
 		try {
-			DriverManager.getConnection(conf.getUrl(),conf.getUsername(),conf.getPassword());
+			connection = DriverManager.getConnection(conf.getUrl(), conf.getUsername(), conf.getPassword());
 		} catch (SQLException e) {
 			log.error("数据源配置 {} , 获取链接失败", conf.getName(), e);
 			return Boolean.FALSE;
+		}finally {
+			try {
+				connection.close();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 		}
 		return Boolean.TRUE;
 	}