From 3908cbed7d4c0e351d61499be7cb084f49d643bf Mon Sep 17 00:00:00 2001
From: xiaoAn <anyongqiang521@163.com>
Date: Tue, 5 Jun 2018 09:34:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?pom=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3json=E6=96=87=E4=BB=B6=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E4=B9=B1=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0871ce3..334004c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,13 +13,13 @@
 			<id>dev</id>
 			<properties>
 				<repository_url>http://192.168.1.56</repository_url>
-				<db-url><![CDATA[jdbc:mysql://localhost/jfinaloa?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=UTC&nullNamePatternMatchesAll=true&autoReconnect=true]]></db-url>
+				<db-url><![CDATA[jdbc:mysql://localhost:3306/jfinaloa?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=UTC&nullNamePatternMatchesAll=true&autoReconnect=true]]></db-url>
 				<db-username>root</db-username>
-				<db-password>root</db-password>
+				<db-password>123456</db-password>
 				<db-type>mysql</db-type>
 				<db-name>jfinaloa</db-name>
 				<dev-model>true</dev-model>
-				<workspace-path>E:/workspaces/workspaceLion/LionOA/OA</workspace-path>
+				<workspace-path>D:\Program Files\workspace\oa</workspace-path>
 				<log4j-level>debug</log4j-level>
 			</properties>
 			<!-- 默认激活本环境 -->
@@ -176,6 +176,19 @@
 						</execution>
 					</executions>
 				</plugin>
+				<plugin>
+				    <groupId>org.apache.maven.plugins</groupId>
+				    <artifactId>maven-resources-plugin</artifactId>
+				    <version>2.6</version>
+				    <configuration>
+				        <encoding>UTF-8</encoding>
+				        <nonFilteredFileExtensions>
+				            <nonFilteredFileExtension>xls</nonFilteredFileExtension>
+				            <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
+				            <nonFilteredFileExtension>json</nonFilteredFileExtension>
+				        </nonFilteredFileExtensions>
+				    </configuration>
+				</plugin>
 				<plugin>
 					<groupId>org.mortbay.jetty</groupId>
 					<artifactId>maven-jetty-plugin</artifactId>
-- 
Gitee


From fee1a348a996ce921c9f7a03ff28d6d014a9e593 Mon Sep 17 00:00:00 2001
From: xiaoAn <anyongqiang521@163.com>
Date: Tue, 5 Jun 2018 09:41:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=EF=BC=8C=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=96=87=E4=BB=B6=E6=B7=BB=E5=8A=A0json=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=BF=BD=E7=95=A5=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=E4=B9=B1=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 334004c..4306818 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,13 +13,13 @@
 			<id>dev</id>
 			<properties>
 				<repository_url>http://192.168.1.56</repository_url>
-				<db-url><![CDATA[jdbc:mysql://localhost:3306/jfinaloa?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=UTC&nullNamePatternMatchesAll=true&autoReconnect=true]]></db-url>
+				<db-url><![CDATA[jdbc:mysql://localhost/jfinaloa?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=UTC&nullNamePatternMatchesAll=true&autoReconnect=true]]></db-url>
 				<db-username>root</db-username>
-				<db-password>123456</db-password>
+				<db-password>root</db-password>
 				<db-type>mysql</db-type>
 				<db-name>jfinaloa</db-name>
 				<dev-model>true</dev-model>
-				<workspace-path>D:\Program Files\workspace\oa</workspace-path>
+				<workspace-path>E:/workspaces/workspaceLion/LionOA/OA</workspace-path>
 				<log4j-level>debug</log4j-level>
 			</properties>
 			<!-- 默认激活本环境 -->
@@ -183,8 +183,6 @@
 				    <configuration>
 				        <encoding>UTF-8</encoding>
 				        <nonFilteredFileExtensions>
-				            <nonFilteredFileExtension>xls</nonFilteredFileExtension>
-				            <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
 				            <nonFilteredFileExtension>json</nonFilteredFileExtension>
 				        </nonFilteredFileExtensions>
 				    </configuration>
-- 
Gitee