From d91d9316da648a17deb3acaa77fd5d0ef1e46611 Mon Sep 17 00:00:00 2001
From: wuxinxue <wuxinxue@sinobest.cn>
Date: Tue, 26 Nov 2019 14:56:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kettle-webapp/pom.xml                         |  9 +++++
 .../webapp/WEB-INF/dispatcher-servlet.xml     |  4 +--
 pom.xml                                       | 35 +++++++++++++------
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/kettle-webapp/pom.xml b/kettle-webapp/pom.xml
index 0c90e30..8ed0b35 100644
--- a/kettle-webapp/pom.xml
+++ b/kettle-webapp/pom.xml
@@ -33,6 +33,15 @@
                     </connectors>
                 </configuration>
             </plugin>
+            <plugin>
+			  <groupId>org.apache.tomcat.maven</groupId>
+			  <artifactId>tomcat7-maven-plugin</artifactId>
+			  <version>2.2</version>
+			  <configuration>
+				<port>8080</port>
+				<path>/</path>
+			  </configuration>
+			</plugin>
         </plugins>
     </build>
     <dependencies>
diff --git a/kettle-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/kettle-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml
index 46be8df..351534a 100644
--- a/kettle-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml
+++ b/kettle-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml
@@ -62,8 +62,8 @@
         <!--192.168.1.201:3306   hadoop-->
         <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
         <property name="url" value="jdbc:mysql://localhost:3306/kettle"/>
-        <property name="username" value="root"/>
-        <property name="password" value="root"/>
+        <property name="username" value="kettle"/>
+        <property name="password" value="kettle123"/>
     </bean>
 
     <!-- spring集成MyBatis3 -->
diff --git a/pom.xml b/pom.xml
index c9e7fdd..7b58bb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,6 +18,16 @@
     </properties>
 
     <dependencies>
+    	<dependency>
+		    <groupId>commons-fileupload</groupId>
+		    <artifactId>commons-fileupload</artifactId>
+		    <version>1.4</version>
+		</dependency>
+    	<dependency>
+		  <groupId>pentaho</groupId>
+		  <artifactId>pentaho-big-data-api-cluster</artifactId>
+		  <version>7.1.0.0-12</version>
+		</dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
@@ -177,6 +187,7 @@
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <version>2.5</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -342,19 +353,21 @@
     </profiles>
 
     <repositories>
-        <repository>
+       <!-- 阿里云maven仓库 -->
+       <!-- <repository>
             <id>pentaho-releases</id>
             <name>Kettle</name>
             <url>https://nexus.pentaho.org/content/groups/omni/</url>
-        </repository>
-        <!-- 阿里云maven仓库 -->
-        <repository>
-            <id>public</id>
-            <name>aliyun nexus</name>
-            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
+        </repository>  -->
+	    <repository>
+	      <id>pentaho-public</id>
+	      <name>Pentaho Public</name>
+	      <url>https://nexus.pentaho.org/repository/proxy-pentaho-public-release-group/</url>
+	    </repository>
+		<repository>
+	      <id>public-3rd-party-release</id>
+	      <name>public-3rd-party-release</name>
+	      <url>https://nexus.pentaho.org/repository/proxy-public-3rd-party-release/</url>
+	    </repository>
     </repositories>
 </project>
\ No newline at end of file