From 7594c30c17c787d07d4f567faef46140ee504531 Mon Sep 17 00:00:00 2001
From: zhouyahui <zhouyh@mail2.tenwa.com.cn>
Date: Sun, 3 Jun 2018 23:43:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .classpath                      | 64 ++++++++++++++++-----------------
 .tomcatplugin                   |  2 +-
 WebContent/META-INF/context.xml | 34 ++++++++----------
 config/quartz.properties        |  4 +--
 4 files changed, 50 insertions(+), 54 deletions(-)

diff --git a/.classpath b/.classpath
index 4f69b5689..1e93645e3 100644
--- a/.classpath
+++ b/.classpath
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="calc"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src_acct"/>
-	<classpathentry kind="src" path="src_base"/>
-	<classpathentry kind="src" path="src_core"/>
-	<classpathentry kind="src" path="src_prd"/>
-	<classpathentry kind="src" path="src_sys"/>
-	<classpathentry kind="src" path="src_tenwa"/>
-	<classpathentry kind="src" path="config"/>
-	<classpathentry kind="src" path="src_app"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="var" path="TOMCAT_HOME/lib/servlet-api.jar"/>
-	<classpathentry kind="var" path="TOMCAT_HOME/lib/jasper.jar"/>
-	<classpathentry kind="var" path="TOMCAT_HOME/lib/jsp-api.jar"/>
-	<classpathentry kind="var" path="TOMCAT_HOME/lib/el-api.jar"/>
-	<classpathentry kind="var" path="TOMCAT_HOME/lib/annotations-api.jar"/>
-	<classpathentry kind="src" path="src_jbo"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
-		<attributes>
-			<attribute name="owner.project.facets" value="jst.web"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="calc"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src_acct"/>
+	<classpathentry kind="src" path="src_app"/>
+	<classpathentry kind="src" path="src_base"/>
+	<classpathentry kind="src" path="src_core"/>
+	<classpathentry kind="src" path="src_jbo"/>
+	<classpathentry kind="src" path="src_prd"/>
+	<classpathentry kind="src" path="src_sys"/>
+	<classpathentry kind="src" path="src_tenwa"/>
+	<classpathentry kind="src" path="work"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="TOMCAT_HOME/lib/servlet-api.jar"/>
+	<classpathentry kind="var" path="TOMCAT_HOME/lib/jasper.jar"/>
+	<classpathentry kind="var" path="TOMCAT_HOME/lib/jsp-api.jar"/>
+	<classpathentry kind="var" path="TOMCAT_HOME/lib/el-api.jar"/>
+	<classpathentry kind="var" path="TOMCAT_HOME/lib/annotations-api.jar"/>
+	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
+</classpath>
diff --git a/.tomcatplugin b/.tomcatplugin
index 546ecaf04..99785289a 100644
--- a/.tomcatplugin
+++ b/.tomcatplugin
@@ -7,5 +7,5 @@
     <updateXml>true</updateXml>
     <warLocation></warLocation>
     <extraInfo></extraInfo>
-    <webPath>/apzl</webPath>
+    <webPath>/apzl_leasing</webPath>
 </tomcatProjectProperties>
diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml
index 8b1536381..1efdd390a 100644
--- a/WebContent/META-INF/context.xml
+++ b/WebContent/META-INF/context.xml
@@ -1,19 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Context>
-	<!-- <Resource name="jdbc/als" auth="Container" type="javax.sql.DataSource" 
-		maxActive="30" maxIdle="2" maxWait="10000" username="tel6" password="tel6_123" 
-		driverClassName="com.mysql.jdbc.Driver" url="jdbc:mysql://192.168.0.16:3306/tel6?useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnect=true" 
-		/> <Resource name="jdbc/als" auth="Container" type="javax.sql.DataSource" 
-		maxActive="30" maxIdle="2" maxWait="10000" username="tel6_test" password="tel6_123" 
-		driverClassName="com.mysql.jdbc.Driver" url="jdbc:mysql://127.0.0.1:3306/tel6_test?rewriteBatchedStatements=true&amp;useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnect=true" 
-		/> -->
-	<Resource name="jdbc/als" auth="Container" type="javax.sql.DataSource"
-		maxActive="30" maxIdle="2" maxWait="10000" username="tel6" password="tel6_123"
-		driverClassName="com.mysql.jdbc.Driver"
-		url="jdbc:mysql://localhost:3306/apzl?rewriteBatchedStatements=true&amp;useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnectForPools=true&amp;autoReconnect=true" />
-	<!-- <Resource name="jdbc/als" auth="Container" type="javax.sql.DataSource" 
-		maxActive="30" maxIdle="2" maxWait="10000" username="tel6" password="tel6_123" 
-		driverClassName="com.mysql.jdbc.Driver" url="jdbc:mysql://192.168.0.25:3306/tel6?rewriteBatchedStatements=true&amp;useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnect=true" 
-		/> -->
-</Context>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<Context>
+  <Resource
+     name="jdbc/als"
+     auth="Container"
+     type="javax.sql.DataSource"
+     maxActive="30"
+     maxIdle="2"
+     maxWait="10000"
+     username="apzl"
+     password="apzl@2018"
+     driverClassName="com.mysql.jdbc.Driver"
+     url="jdbc:mysql://119.3.11.192:3306/apzl?rewriteBatchedStatements=true&amp;useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnectForPools=true&amp;autoReconnect=true" />
+</Context>
+
diff --git a/config/quartz.properties b/config/quartz.properties
index 60c930643..cdb386fd8 100644
--- a/config/quartz.properties
+++ b/config/quartz.properties
@@ -5,8 +5,8 @@ org.quartz.dataSource.zhulhDS.URL=jdbc:mysql://localhost:3306/apzl?rewriteBatche
 #org.quartz.dataSource.zhulhDS.key=LR8hbgC5Gwc920lYM5vH8g==
 #apzl
 org.quartz.dataSource.zhulhDS.user=M4pI4TUxX9vC3yTrCAkD1w==
-#123
-org.quartz.dataSource.zhulhDS.key=uuTHd6Q3uNnUjWzaY9EPTA==
+#apzl@2018
+org.quartz.dataSource.zhulhDS.key=Qx3JdE3vR3ho+XxIQvh6sw==
 org.quartz.dataSource.zhulhDS.driver=com.mysql.jdbc.Driver
 c3p0.minPoolSize=5
 c3p0.maxPoolSize=400