From 7fd694fc697e3f66a1323cbf626834edf32338a0 Mon Sep 17 00:00:00 2001
From: lxyer <237809796@qq.com>
Date: Sun, 19 May 2019 18:31:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20db=5Fplat=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=90=BA=E5=B8=A6&=E6=97=B6=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 root/api/db.js                            | 4 ++--
 root/api/plat.js                          | 3 ++-
 src/main/java/net/tccn/base/ExcelKit.java | 3 +--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/root/api/db.js b/root/api/db.js
index 4900d7c..445153a 100644
--- a/root/api/db.js
+++ b/root/api/db.js
@@ -1,7 +1,7 @@
 const db = {
     catalogList({dbAccount, dbPlatId}) { // database列表
-        console.log(dbAccount)
-        return red.postX('/_db/catalog_list', {dbAccount: JSON.stringify(dbAccount), dbPlatId})
+        console.log(JSON.stringify(dbAccount))
+        return red.postX('/_db/catalog_list', {dbAccount: escape(JSON.stringify(dbAccount)), dbPlatId})
     },
     tableList({dbPlatId, catalog}) { // 数据库表列表
         return red.postX('/_db/table_list', {dbPlatId, catalog})
diff --git a/root/api/plat.js b/root/api/plat.js
index 69e643f..9dffe0b 100644
--- a/root/api/plat.js
+++ b/root/api/plat.js
@@ -13,7 +13,8 @@ const plat = {
         return red.getX('/plat/db_list', params)
     },
     dbSave({plat}) {
-        return red.postX('/plat/db_save', {plat:JSON.stringify(plat)})
+        plat["url"] = escape(plat["url"])
+        return red.postX('/plat/db_save', {plat: JSON.stringify(plat)})
     },
 
 }
\ No newline at end of file
diff --git a/src/main/java/net/tccn/base/ExcelKit.java b/src/main/java/net/tccn/base/ExcelKit.java
index 2551f11..40ae44a 100644
--- a/src/main/java/net/tccn/base/ExcelKit.java
+++ b/src/main/java/net/tccn/base/ExcelKit.java
@@ -1,7 +1,6 @@
 package net.tccn.base;
 
 import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
-import org.apache.poi.ss.formula.functions.T;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 
@@ -75,7 +74,7 @@ public class ExcelKit {
      * @author LiangXianYou
      * @date 2015-3-13 上午11:00:30
      */
-    public static Workbook exportExcel(List<T> list, LinkedHashMap<String, String> headMap) throws Exception {
+    public static <T> Workbook exportExcel(List<T> list, LinkedHashMap<String, String> headMap) throws Exception {
         String[] hdNames = new String[headMap.size()]; //
         String[] hds = new String[headMap.size()];