diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp
index 1ca27f364..da00ccab5 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp
@@ -32,6 +32,7 @@
 	}
 	//判断是不是流程的第二步
 	if("0020".equals(PhaseNo)){
+		btnflag = "false";
 		signs = "true";
 	}
 	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
@@ -70,8 +71,12 @@
 	})
     //完成电子签约
 	function signOnLine(){
-		 var results = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.ContractAward","projectStatus","project_id=<%=projectId%>");
+		 var results = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.ContractAward","projectStatus","project_id=<%=projectId%>,FlowUnid=<%=flowunid%>");
 		 var result = results.split("@");
+		 if("true"==result[3]){
+			 AsDebug.showMessage("提示","请先生成pdf版的合同！！！","","",true);
+			 return;
+		   };
 		  if(eval(result[0])<3){
 			 AsDebug.showMessage("提示","请生成合同,在电子签约","","",true);
 			 return;
@@ -86,10 +91,10 @@
 				 AsDebug.showMessage("提示","电子签约已完成,无需重复发起！","","",true);
 				 return;
 			 };
-			/* if(eval(result[0])==8){
+			if(eval(result[0])==8){
 				 AsDebug.showMessage("提示","电子签约已发起,请签署电子合同！","","",true);
 				 return;
-			}; */
+			};
 	         //查看合同word转换pdf进度
 		    var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","getMakeContractProcess","ProjectId=<%=projectId%>");
 		    if(eval(result)==1){
@@ -153,6 +158,7 @@
 			 return;
 		 };
 	    if(eval(result[0])==4){
+	    	var sReturns = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","downloadDoc","ProjectId=<%=projectId%>,CurUserID=<%=CurUser.getUserID()%>");
 			AsDebug.showMessage("提示","电子签约已完成！","","",true);
 			return;
 		}
diff --git a/WebContent/WEB-INF/etc/template/log4jlog.properties b/WebContent/WEB-INF/etc/template/log4jlog.properties
index 9cff22f12..35238f1cd 100644
--- a/WebContent/WEB-INF/etc/template/log4jlog.properties
+++ b/WebContent/WEB-INF/etc/template/log4jlog.properties
@@ -50,8 +50,8 @@ log4j.appender.MAIL.layout.ConversionPattern=[framework] %d - %c -%-4r [%t] %-5p
 log4j.appender.DATABASE=org.apache.log4j.jdbc.JDBCAppender
 log4j.appender.DATABASE.URL=jdbc:mysql://localhost:3306/test
 log4j.appender.DATABASE.driver=com.mysql.jdbc.Driver
-log4j.appender.DATABASE.user=root
-log4j.appender.DATABASE.password=
+log4j.appender.DATABASE.user=apzl
+log4j.appender.DATABASE.password=apzl@2018
 log4j.appender.DATABASE.sql=INSERT INTO LOG4J (Message) VALUES ('[framework] %d - %c -%-4r [%t] %-5p %c %x - %m%n')
 log4j.appender.DATABASE.layout=org.apache.log4j.PatternLayout
 log4j.appender.DATABASE.layout.ConversionPattern=[framework] %d - %c -%-4r [%t] %-5p %c %x - %m%n
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 22a2c26f8..c8bdb13b3 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -1,557 +1,557 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:jsp="http://java.sun.com/xml/ns/javaee/jsp"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	version="2.5">
-	<display-name>A3Web</display-name>
-	<jsp-config>
-		<jsp-property-group>
-			<display-name>JSPConfiguration</display-name>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>GBK</page-encoding>
-		</jsp-property-group>
-		<jsp-property-group>
-			<display-name>JSPConfiguration</display-name>
-			<url-pattern>*.jspf</url-pattern>
-			<page-encoding>GBK</page-encoding>
-		</jsp-property-group>
-	</jsp-config>
-	<filter>
-		<filter-name>RunFilter</filter-name>
-		<filter-class>com.amarsoft.awe.control.RunFilter</filter-class>
-		<init-param>
-			<param-name>RunTimeDebug</param-name>
-			<param-value>true</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ShowFramePage</param-name>
-			<param-value>true</param-value>
-		</init-param>
-		<init-param>
-			<param-name>DbLog</param-name>
-			<param-value>false</param-value>
-		</init-param>
-		<init-param>
-			<param-name>encoding</param-name>
-			<param-value>GBK</param-value>
-		</init-param>
-		<init-param>
-			<param-name>DataSource</param-name>
-			<param-value>als</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ExcludedURLs</param-name>
-			<param-value>^/.*Logon.jsp,^/.*SaveGraphAjax.jsp,^/.*appDownload.jsp</param-value>
-		</init-param>
-	</filter>
-	<filter-mapping>
-		<filter-name>RunFilter</filter-name>
-		<url-pattern>*.jsp</url-pattern>
-		<dispatcher>REQUEST</dispatcher>
-		<dispatcher>FORWARD</dispatcher>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>RunFilter</filter-name>
-		<url-pattern>/servlet/view/*</url-pattern>
-	</filter-mapping>
-	<servlet>
-		<servlet-name>InitAREServlet</servlet-name>
-		<servlet-class>com.amarsoft.are.InitAREServlet</servlet-class>
-		<init-param>
-			<param-name>ConfigFile</param-name>
-			<param-value>/WEB-INF/etc/are.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>AppHome</param-name>
-			<param-value>/WEB-INF</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet>
-		<servlet-name>InitAWEServlet</servlet-name>
-		<servlet-class>com.amarsoft.awe.control.InitAWEServlet</servlet-class>
-		<init-param>
-			<param-name>ConfigFile</param-name>
-			<param-value>/WEB-INF/etc/a3web.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>CacheFile</param-name>
-			<param-value>/WEB-INF/etc/cache.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>SkinConfig</param-name>
-			<param-value>/WEB-INF/etc/skin.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ButtonConfig</param-name>
-			<param-value>/WEB-INF/etc/button.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>DataSource</param-name>
-			<param-value>als</param-value>
-		</init-param>
-		<load-on-startup>2</load-on-startup>
-	</servlet>
-	<servlet>
-		<servlet-name>RedirectorServlet</servlet-name>
-		<servlet-class>com.amarsoft.awe.control.RedirectorServlet</servlet-class>
-		<init-param>
-			<param-name>encoding</param-name>
-			<param-value>GBK</param-value>
-		</init-param>
-	</servlet>
-	
-	<servlet>
-		<servlet-name>InitSecondHandCarConfig</servlet-name>
-		<servlet-class>com.amarsoft.app.awe.config.InitSecondHandCarConfig</servlet-class>
-		<init-param>
-			<param-name>shutdown-on-unload</param-name>
-			<param-value>true</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	
-	<servlet>
-		<servlet-name>InitCollectConfig</servlet-name>
-		<servlet-class>com.amarsoft.app.awe.config.InitCollectConfig</servlet-class>
-		<init-param>
-			<param-name>shutdown-on-unload</param-name>
-			<param-value>true</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	
-	<servlet>
-		<servlet-name>RewriteRunJavaMethodServlet</servlet-name>
-		<servlet-class>com.tenwa.workflow.RewriteRunJavaMethodServlet</servlet-class>
-		<init-param>
-			<param-name>DataSource</param-name>
-			<param-value>als</param-value>
-		</init-param>
-	</servlet>
-
-	<servlet>
-		<servlet-name>RedirectorDialogServlet</servlet-name>
-		<servlet-class>com.amarsoft.awe.control.RedirectorDialogServlet</servlet-class>
-		<init-param>
-			<param-name>encoding</param-name>
-			<param-value>GBK</param-value>
-		</init-param>
-	</servlet>
-	<servlet>
-		<servlet-name>ForwardServlet</servlet-name>
-		<servlet-class>com.amarsoft.awe.control.ForwardServlet</servlet-class>
-		<init-param>
-			<param-name>encoding</param-name>
-			<param-value>GBK</param-value>
-		</init-param>
-	</servlet>
-	<servlet>
-		<servlet-name>RunJavaMethodServlet</servlet-name>
-		<servlet-class>com.amarsoft.awe.control.RunJavaMethodServlet</servlet-class>
-		<init-param>
-			<param-name>DataSource</param-name>
-			<param-value>als</param-value>
-		</init-param>
-	</servlet>
-	<servlet>
-		<servlet-name>DisplayChart</servlet-name>
-		<servlet-class>org.jfree.chart.servlet.DisplayChart</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>MessageServlet</servlet-name>
-		<servlet-class>com.amarsoft.awe.message.MessageServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>WorkDocFileServlet</servlet-name>
-		<servlet-class>com.amarsoft.awe.common.attachment.WorkDocFileServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>AttachmentViewServlet</servlet-name>
-		<servlet-class>com.amarsoft.awe.common.attachment.AttachmentViewServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>EditOfficeServlet</servlet-name>
-		<servlet-class>com.tenwa.onlineoperation.servlet.EditOfficeServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>FileTemplateViewServlet</servlet-name>
-		<servlet-class>com.amarsoft.filetemplate.servlet.FileTemplateViewServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>DocDownloadServlet</servlet-name>
-		<servlet-class>com.tenwa.doc.servlet.DocDownloadServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>DocDownloadZipServlet</servlet-name>
-		<servlet-class>com.tenwa.doc.servlet.DocDownloadZipServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>DocFlowDownloadZipServlet</servlet-name>
-		<servlet-class>com.tenwa.doc.servlet.DocFlowDownloadZipServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>DownloadZipServlet</servlet-name>
-		<servlet-class>com.tenwa.officetempalte.controller.DownloadZipServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>FileViewServlet</servlet-name>
-		<servlet-class>com.amarsoft.awe.common.attachment.FileViewServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>ShowImageServlet</servlet-name>
-		<servlet-class>com.tenwa.doc.servlet.ShowImageServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>ShowPDFServlet</servlet-name>
-		<servlet-class>com.tenwa.doc.servlet.ShowPDFServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>StreamViewServlet</servlet-name>
-		<servlet-class>com.amarsoft.awe.common.attachment.StreamViewServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>CheckCodeServlet</servlet-name>
-		<servlet-class>com.amarsoft.awe.control.CheckCodeServlet</servlet-class>
-		<init-param>
-			<param-name>CodeLength</param-name>
-			<param-value>5</param-value>
-		</init-param>
-	</servlet>
-	<servlet>
-		<servlet-name>MonitorSOAPServlet</servlet-name>
-		<servlet-class>com.amarsoft.awe.common.monitor.MonitorSOAPServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>RedirectorServlet</servlet-name>
-		<url-pattern>/Redirector</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>RedirectorDialogServlet</servlet-name>
-		<url-pattern>/RedirectorDialog</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>RunJavaMethodServlet</servlet-name>
-		<url-pattern>/servlet/run</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>ForwardServlet</servlet-name>
-		<url-pattern>/ao</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>DisplayChart</servlet-name>
-		<url-pattern>/chartview</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>MessageServlet</servlet-name>
-		<url-pattern>/servlet/message</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WorkDocFileServlet</servlet-name>
-		<url-pattern>/servlet/workdocfile/*</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>AttachmentViewServlet</servlet-name>
-		<url-pattern>/servlet/view/attachment</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>EditOfficeServlet</servlet-name>
-		<url-pattern>/servlet/view/editOffice</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>FileTemplateViewServlet</servlet-name>
-		<url-pattern>/servlet/view/fileTemplateView</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>DocDownloadServlet</servlet-name>
-		<url-pattern>/servlet/view/docDownloadServlet</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>RewriteRunJavaMethodServlet</servlet-name>
-		<url-pattern>/servlet/runflow</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>DocDownloadZipServlet</servlet-name>
-		<url-pattern>/servlet/view/docDownloadZipServlet</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>DocFlowDownloadZipServlet</servlet-name>
-		<url-pattern>/servlet/view/docFlowDownloadZipServlet</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>DownloadZipServlet</servlet-name>
-		<url-pattern>/servlet/view/DownloadZipServlet</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>AttachmentViewServlet</servlet-name>
-		<url-pattern>/servlet/pdf/*</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>FileViewServlet</servlet-name>
-		<url-pattern>/servlet/view/file</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>ShowImageServlet</servlet-name>
-		<url-pattern>/servlet/view/image</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>ShowPDFServlet</servlet-name>
-		<url-pattern>/servlet/view/pdf</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>FileViewServlet</servlet-name>
-		<url-pattern>/servlet/viewpic</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>StreamViewServlet</servlet-name>
-		<url-pattern>/servlet/view/stream</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>CheckCodeServlet</servlet-name>
-		<url-pattern>/servlet/checkcode</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>MonitorSOAPServlet</servlet-name>
-		<url-pattern>/servlet/monitor</url-pattern>
-	</servlet-mapping>
-	<servlet>
-		<servlet-name>QueryResultServlet</servlet-name>
-		<servlet-class>com.amarsoft.asquery.servlet.QueryResultServlet</servlet-class>
-		<init-param>
-			<param-name>threadCount</param-name>
-			<param-value>5</param-value>
-		</init-param>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>QueryResultServlet</servlet-name>
-		<url-pattern>/SynchResultQuery</url-pattern>
-	</servlet-mapping>
-	<servlet>
-		<servlet-name>InfoPageExportServlet</servlet-name>
-		<servlet-class>com.amarsoft.awe.dw.export.servlet.InfoExportServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>ListPageExportServlet</servlet-name>
-		<servlet-class>com.amarsoft.awe.dw.export.servlet.ListExportServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>InfoPageExportServlet</servlet-name>
-		<url-pattern>/EAS/PageExport/info</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>ListPageExportServlet</servlet-name>
-		<url-pattern>/EAS/PageExport/list</url-pattern>
-	</servlet-mapping>
-	<servlet>
-		<servlet-name>workflow_GetProcess</servlet-name>
-		<servlet-class>com.amarsoft.biz.workflow.graph.web.GetProcess</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>workflow_UpdateProcess</servlet-name>
-		<servlet-class>com.amarsoft.biz.workflow.graph.web.UpdateProcess</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>workflow_AddProcess</servlet-name>
-		<servlet-class>com.amarsoft.biz.workflow.graph.web.AddProcess</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>workflow_DeleteProcess</servlet-name>
-		<servlet-class>com.amarsoft.biz.workflow.graph.web.DeleteProcess</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>workflow_ListProcess</servlet-name>
-		<servlet-class>com.amarsoft.biz.workflow.graph.web.ListProcess</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>workflow_GetProcess</servlet-name>
-		<url-pattern>/getprocess.wf</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>workflow_UpdateProcess</servlet-name>
-		<url-pattern>/updateprocess.wf</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>workflow_AddProcess</servlet-name>
-		<url-pattern>/addprocess.wf</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>workflow_DeleteProcess</servlet-name>
-		<url-pattern>/deleteprocess.wf</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>workflow_ListProcess</servlet-name>
-		<url-pattern>/listprocess.wf</url-pattern>
-	</servlet-mapping>
-	<welcome-file-list id="WelcomeFileList_1">
-		<welcome-file>index.html</welcome-file>
-	</welcome-file-list>
-	<error-page>
-		<error-code>404</error-code>
-		<location>/Frame/page/sys/NoPageInfo.jsp</location>
-	</error-page>
-	<resource-ref id="ResourceRef_1">
-		<res-ref-name>jdbc/als</res-ref-name>
-		<res-type>javax.sql.DataSource</res-type>
-		<res-auth>Application</res-auth>
-		<res-sharing-scope>Shareable</res-sharing-scope>
-	</resource-ref>
-	<resource-ref id="ResourceRef_2">
-		<res-ref-name>jdbc/report</res-ref-name>
-		<res-type>javax.sql.DataSource</res-type>
-		<res-auth>Application</res-auth>
-		<res-sharing-scope>Shareable</res-sharing-scope>
-	</resource-ref>
-	<session-config>
-		<session-timeout>240</session-timeout>
-	</session-config>
-	<servlet>
-		<servlet-name>InitDBType</servlet-name>
-		<servlet-class>com.amarsoft.app.awe.config.InitDBType</servlet-class>
-		<init-param>
-			<param-name>shutdown-on-unload</param-name>
-			<param-value>true</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet>
-		<servlet-name>QuartzInitializer</servlet-name>
-		<servlet-class>com.tenwa.quartz.MyQuartzInitializerServlet</servlet-class>
-		<init-param>
-			<param-name>config-file</param-name>
-			<param-value>quartz.properties</param-value>
-		</init-param>
-		<init-param>
-			<param-name>shutdown-on-unload</param-name>
-			<param-value>true</param-value>
-		</init-param>
-		<load-on-startup>5</load-on-startup>
-	</servlet>
-	<context-param>
-		<param-name>webAppRootKey</param-name>
-		<param-value>webapp.port</param-value>
-	</context-param>
-	<context-param>
-		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-		<param-value>ApplicationResources</param-value>
-	</context-param>
-	<context-param>
-		<param-name>log4jConfigLocation</param-name>
-		<param-value>/WEB-INF/classes/log4j.xml</param-value>
-	</context-param>
-	<context-param>
-		<description>閰嶇疆鏂囦欢浣嶇疆</description>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>classpath:applicationContext*.xml</param-value>
-	</context-param>
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-
-	<!--- ================================== -->
-	<!-- webApi閰嶇疆 -->
-	<!--- ================================== -->
-	<!-- restfull杞彂澶勭悊鐨剆ervlet -->
-	<servlet>
-		<description>Restfull澶勭悊Servlet</description>
-		<display-name>RestfullServlet</display-name>
-		<servlet-name>RestfullServlet</servlet-name>
-		<!-- <servlet-class>cn.coyoteam.aweresf.web.servlet.RestfullServiceServlet</servlet-class> -->
-		<servlet-class>cn.servlet.RestfullServiceServlet</servlet-class>
-
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>RestfullServlet</servlet-name>
-		<url-pattern>/webapi/resf/*</url-pattern>
-	</servlet-mapping>
-	<context-param>
-		<description>restfull鑷姩鎵弿璺緞璁剧疆</description>
-		<param-name>RestfullScanPackage</param-name>
-		<param-value>
-	        apx.com.amarsoft.als.user.logon.controller,
-			apx.com.amarsoft.als.user.pwd.controller,
-			apx.com.amarsoft.als.user.sys.controller,
-			apx.com.amarsoft.als.doc.controller,
-			apx.com.amarsoft.als.currency.select.controller,
-			apx.com.amarsoft.als.currency.select.contract.controller,
-				<!-- 鎴戠殑宸ヤ綔 -->
-					<!-- 鐢宠鍒楄〃  锛� applytype phasetype ObjectNo -->
-					apx.com.amarsoft.als.apzl.apply.business.query.controller,
-					<!-- 涓氬姟鐢宠鍙戣捣 -->
-					apx.com.amarsoft.als.apzl.apply.business.start.controller,
-				<!-- 姹借溅閫夋嫨妗� -->
-					apx.com.amarsoft.als.currency.select.apzl.car.controller,
-				<!-- 浜у搧閫夋嫨妗� -->
-					apx.com.amarsoft.als.currency.select.apzl.product.controller,
-					
-				<!-- 鎰忚 -->	
-					<!-- 绛剧讲鎰忚 -->
-					apx.com.amarsoft.als.business.opinion.sign.controller,
-					<!-- 娴佺▼鍘嗗彶鎰忚 -->
-					apx.com.amarsoft.als.business.opinion.history.controller,
-				
-				<!-- 娴佺▼闄勪欢涓�瑙� -->
-					apx.com.amarsoft.als.business.attachment.controller,
-				
-				<!-- 娴佺▼鍔ㄤ綔 -->
-					apx.com.amarsoft.als.business.action.ready.controller,
-					apx.com.amarsoft.als.business.action.submit.controller,
-					apx.com.amarsoft.als.business.action.back.controller,
-					apx.com.amarsoft.als.business.comm.action.controller,
-					
-				<!-- 閫氱敤 鍒楄〃/琛ㄥ崟 鏌ヨ 淇濆瓨 澶勭悊 -->
-					<!-- 閫氱敤妯℃澘鏌ヨ 淇濆瓨 鍒楄〃 鍒犻櫎 澶勭悊 -->
-					apx.com.amarsoft.als.base.awe.controller,
-					<!-- 鎵ｆ鍗′俊鎭彉鏇�-->
-					apx.com.amarsoft.als.business.change.controller,
-					<!-- 淇℃伅鏍￠獙-->
-					apx.com.amarsoft.als.business.verification.controller,
-    </param-value>
-	</context-param>
-	<!-- 瀵规暣涓獁ebapi杩涜涓�浜涢�氱敤澶勭悊鐨勮繃婊ゅ櫒 -->
-	<filter>
-		<display-name>SessionAndContextFilter</display-name>
-		<filter-name>SessionAndContextFilter</filter-name>
-		<!-- <filter-class>cn.coyoteam.aweresf.web.filter.SessionAndContextFilter</filter-class> -->
-		<filter-class>cn.filter.SessionAndContextFilter</filter-class>
-		<init-param>
-			<param-name>NoCheckURI</param-name>
-			<param-value>
-             	<!-- 鐢ㄦ埛 鐧诲綍/娉ㄩ攢 -->
-					/resf/logon/manager/logon, 
-					/resf/logon/manager/logout,
-				<!-- 鍏抽棴鎵嬪娍瀵嗙爜  鏌ヨ鎵嬪娍瀵嗙爜鐘舵�� -->
-					/resf/user/center/manager/acquisition/gesture, 
-					/resf/user/center/manager/close/gesture,
-				<!-- 妫�娴嬬郴缁� 鐗堟湰 -->
-					/resf/user/center/manager/detection/version,
-				<!-- 涓嬭浇 --> 
-					/resf/files/down/docById,
-					/resf/files/downloadPlist,
-					/resf/files/downloadApp,
-					/resf/files/downloadAppById,
-        </param-value>
-		</init-param>
-		<init-param>
-			<param-name>TokenHoldTime</param-name>
-			<param-value>31536000</param-value><!-- 3600*24*365=31536000 -->
-		</init-param>
-		<init-param>
-			<param-name>dataSource</param-name>
-			<param-value>als</param-value>
-		</init-param>
-		<init-param>
-			<param-name>encoding</param-name>
-			<param-value>GBK</param-value>
-		</init-param>
-	</filter>
-	<filter-mapping>
-		<filter-name>SessionAndContextFilter</filter-name>
-		<url-pattern>/webapi/*</url-pattern>
-	</filter-mapping>
-	<!--- ================================== -->
-	<!-- 鏀寔webapi-缁撴潫 -->
-	<!--- ================================== -->
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:jsp="http://java.sun.com/xml/ns/javaee/jsp"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+	version="2.5">
+	<display-name>A3Web</display-name>
+	<jsp-config>
+		<jsp-property-group>
+			<display-name>JSPConfiguration</display-name>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>GBK</page-encoding>
+		</jsp-property-group>
+		<jsp-property-group>
+			<display-name>JSPConfiguration</display-name>
+			<url-pattern>*.jspf</url-pattern>
+			<page-encoding>GBK</page-encoding>
+		</jsp-property-group>
+	</jsp-config>
+	<filter>
+		<filter-name>RunFilter</filter-name>
+		<filter-class>com.amarsoft.awe.control.RunFilter</filter-class>
+		<init-param>
+			<param-name>RunTimeDebug</param-name>
+			<param-value>true</param-value>
+		</init-param>
+		<init-param>
+			<param-name>ShowFramePage</param-name>
+			<param-value>true</param-value>
+		</init-param>
+		<init-param>
+			<param-name>DbLog</param-name>
+			<param-value>false</param-value>
+		</init-param>
+		<init-param>
+			<param-name>encoding</param-name>
+			<param-value>GBK</param-value>
+		</init-param>
+		<init-param>
+			<param-name>DataSource</param-name>
+			<param-value>als</param-value>
+		</init-param>
+		<init-param>
+			<param-name>ExcludedURLs</param-name>
+			<param-value>^/.*Logon.jsp,^/.*SaveGraphAjax.jsp,^/.*appDownload.jsp</param-value>
+		</init-param>
+	</filter>
+	<filter-mapping>
+		<filter-name>RunFilter</filter-name>
+		<url-pattern>*.jsp</url-pattern>
+		<dispatcher>REQUEST</dispatcher>
+		<dispatcher>FORWARD</dispatcher>
+	</filter-mapping>
+	<filter-mapping>
+		<filter-name>RunFilter</filter-name>
+		<url-pattern>/servlet/view/*</url-pattern>
+	</filter-mapping>
+	<servlet>
+		<servlet-name>InitAREServlet</servlet-name>
+		<servlet-class>com.amarsoft.are.InitAREServlet</servlet-class>
+		<init-param>
+			<param-name>ConfigFile</param-name>
+			<param-value>/WEB-INF/etc/are.xml</param-value>
+		</init-param>
+		<init-param>
+			<param-name>AppHome</param-name>
+			<param-value>/WEB-INF</param-value>
+		</init-param>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet>
+		<servlet-name>InitAWEServlet</servlet-name>
+		<servlet-class>com.amarsoft.awe.control.InitAWEServlet</servlet-class>
+		<init-param>
+			<param-name>ConfigFile</param-name>
+			<param-value>/WEB-INF/etc/a3web.xml</param-value>
+		</init-param>
+		<init-param>
+			<param-name>CacheFile</param-name>
+			<param-value>/WEB-INF/etc/cache.xml</param-value>
+		</init-param>
+		<init-param>
+			<param-name>SkinConfig</param-name>
+			<param-value>/WEB-INF/etc/skin.xml</param-value>
+		</init-param>
+		<init-param>
+			<param-name>ButtonConfig</param-name>
+			<param-value>/WEB-INF/etc/button.xml</param-value>
+		</init-param>
+		<init-param>
+			<param-name>DataSource</param-name>
+			<param-value>als</param-value>
+		</init-param>
+		<load-on-startup>2</load-on-startup>
+	</servlet>
+	<servlet>
+		<servlet-name>RedirectorServlet</servlet-name>
+		<servlet-class>com.amarsoft.awe.control.RedirectorServlet</servlet-class>
+		<init-param>
+			<param-name>encoding</param-name>
+			<param-value>GBK</param-value>
+		</init-param>
+	</servlet>
+	
+	<servlet>
+		<servlet-name>InitSecondHandCarConfig</servlet-name>
+		<servlet-class>com.amarsoft.app.awe.config.InitSecondHandCarConfig</servlet-class>
+		<init-param>
+			<param-name>shutdown-on-unload</param-name>
+			<param-value>true</param-value>
+		</init-param>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	
+	<servlet>
+		<servlet-name>InitCollectConfig</servlet-name>
+		<servlet-class>com.amarsoft.app.awe.config.InitCollectConfig</servlet-class>
+		<init-param>
+			<param-name>shutdown-on-unload</param-name>
+			<param-value>true</param-value>
+		</init-param>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	
+	<servlet>
+		<servlet-name>RewriteRunJavaMethodServlet</servlet-name>
+		<servlet-class>com.tenwa.workflow.RewriteRunJavaMethodServlet</servlet-class>
+		<init-param>
+			<param-name>DataSource</param-name>
+			<param-value>als</param-value>
+		</init-param>
+	</servlet>
+
+	<servlet>
+		<servlet-name>RedirectorDialogServlet</servlet-name>
+		<servlet-class>com.amarsoft.awe.control.RedirectorDialogServlet</servlet-class>
+		<init-param>
+			<param-name>encoding</param-name>
+			<param-value>GBK</param-value>
+		</init-param>
+	</servlet>
+	<servlet>
+		<servlet-name>ForwardServlet</servlet-name>
+		<servlet-class>com.amarsoft.awe.control.ForwardServlet</servlet-class>
+		<init-param>
+			<param-name>encoding</param-name>
+			<param-value>GBK</param-value>
+		</init-param>
+	</servlet>
+	<servlet>
+		<servlet-name>RunJavaMethodServlet</servlet-name>
+		<servlet-class>com.amarsoft.awe.control.RunJavaMethodServlet</servlet-class>
+		<init-param>
+			<param-name>DataSource</param-name>
+			<param-value>als</param-value>
+		</init-param>
+	</servlet>
+	<servlet>
+		<servlet-name>DisplayChart</servlet-name>
+		<servlet-class>org.jfree.chart.servlet.DisplayChart</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>MessageServlet</servlet-name>
+		<servlet-class>com.amarsoft.awe.message.MessageServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>WorkDocFileServlet</servlet-name>
+		<servlet-class>com.amarsoft.awe.common.attachment.WorkDocFileServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>AttachmentViewServlet</servlet-name>
+		<servlet-class>com.amarsoft.awe.common.attachment.AttachmentViewServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>EditOfficeServlet</servlet-name>
+		<servlet-class>com.tenwa.onlineoperation.servlet.EditOfficeServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>FileTemplateViewServlet</servlet-name>
+		<servlet-class>com.amarsoft.filetemplate.servlet.FileTemplateViewServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>DocDownloadServlet</servlet-name>
+		<servlet-class>com.tenwa.doc.servlet.DocDownloadServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>DocDownloadZipServlet</servlet-name>
+		<servlet-class>com.tenwa.doc.servlet.DocDownloadZipServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>DocFlowDownloadZipServlet</servlet-name>
+		<servlet-class>com.tenwa.doc.servlet.DocFlowDownloadZipServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>DownloadZipServlet</servlet-name>
+		<servlet-class>com.tenwa.officetempalte.controller.DownloadZipServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>FileViewServlet</servlet-name>
+		<servlet-class>com.amarsoft.awe.common.attachment.FileViewServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>ShowImageServlet</servlet-name>
+		<servlet-class>com.tenwa.doc.servlet.ShowImageServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>ShowPDFServlet</servlet-name>
+		<servlet-class>com.tenwa.doc.servlet.ShowPDFServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>StreamViewServlet</servlet-name>
+		<servlet-class>com.amarsoft.awe.common.attachment.StreamViewServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>CheckCodeServlet</servlet-name>
+		<servlet-class>com.amarsoft.awe.control.CheckCodeServlet</servlet-class>
+		<init-param>
+			<param-name>CodeLength</param-name>
+			<param-value>5</param-value>
+		</init-param>
+	</servlet>
+	<servlet>
+		<servlet-name>MonitorSOAPServlet</servlet-name>
+		<servlet-class>com.amarsoft.awe.common.monitor.MonitorSOAPServlet</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>RedirectorServlet</servlet-name>
+		<url-pattern>/Redirector</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>RedirectorDialogServlet</servlet-name>
+		<url-pattern>/RedirectorDialog</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>RunJavaMethodServlet</servlet-name>
+		<url-pattern>/servlet/run</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>ForwardServlet</servlet-name>
+		<url-pattern>/ao</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>DisplayChart</servlet-name>
+		<url-pattern>/chartview</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>MessageServlet</servlet-name>
+		<url-pattern>/servlet/message</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>WorkDocFileServlet</servlet-name>
+		<url-pattern>/servlet/workdocfile/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>AttachmentViewServlet</servlet-name>
+		<url-pattern>/servlet/view/attachment</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>EditOfficeServlet</servlet-name>
+		<url-pattern>/servlet/view/editOffice</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>FileTemplateViewServlet</servlet-name>
+		<url-pattern>/servlet/view/fileTemplateView</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>DocDownloadServlet</servlet-name>
+		<url-pattern>/servlet/view/docDownloadServlet</url-pattern>
+	</servlet-mapping>
+
+	<servlet-mapping>
+		<servlet-name>RewriteRunJavaMethodServlet</servlet-name>
+		<url-pattern>/servlet/runflow</url-pattern>
+	</servlet-mapping>
+
+	<servlet-mapping>
+		<servlet-name>DocDownloadZipServlet</servlet-name>
+		<url-pattern>/servlet/view/docDownloadZipServlet</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>DocFlowDownloadZipServlet</servlet-name>
+		<url-pattern>/servlet/view/docFlowDownloadZipServlet</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>DownloadZipServlet</servlet-name>
+		<url-pattern>/servlet/view/DownloadZipServlet</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>AttachmentViewServlet</servlet-name>
+		<url-pattern>/servlet/pdf/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>FileViewServlet</servlet-name>
+		<url-pattern>/servlet/view/file</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>ShowImageServlet</servlet-name>
+		<url-pattern>/servlet/view/image</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>ShowPDFServlet</servlet-name>
+		<url-pattern>/servlet/view/pdf</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>FileViewServlet</servlet-name>
+		<url-pattern>/servlet/viewpic</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>StreamViewServlet</servlet-name>
+		<url-pattern>/servlet/view/stream</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>CheckCodeServlet</servlet-name>
+		<url-pattern>/servlet/checkcode</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>MonitorSOAPServlet</servlet-name>
+		<url-pattern>/servlet/monitor</url-pattern>
+	</servlet-mapping>
+	<servlet>
+		<servlet-name>QueryResultServlet</servlet-name>
+		<servlet-class>com.amarsoft.asquery.servlet.QueryResultServlet</servlet-class>
+		<init-param>
+			<param-name>threadCount</param-name>
+			<param-value>5</param-value>
+		</init-param>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>QueryResultServlet</servlet-name>
+		<url-pattern>/SynchResultQuery</url-pattern>
+	</servlet-mapping>
+	<servlet>
+		<servlet-name>InfoPageExportServlet</servlet-name>
+		<servlet-class>com.amarsoft.awe.dw.export.servlet.InfoExportServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>ListPageExportServlet</servlet-name>
+		<servlet-class>com.amarsoft.awe.dw.export.servlet.ListExportServlet</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>InfoPageExportServlet</servlet-name>
+		<url-pattern>/EAS/PageExport/info</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>ListPageExportServlet</servlet-name>
+		<url-pattern>/EAS/PageExport/list</url-pattern>
+	</servlet-mapping>
+	<servlet>
+		<servlet-name>workflow_GetProcess</servlet-name>
+		<servlet-class>com.amarsoft.biz.workflow.graph.web.GetProcess</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>workflow_UpdateProcess</servlet-name>
+		<servlet-class>com.amarsoft.biz.workflow.graph.web.UpdateProcess</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>workflow_AddProcess</servlet-name>
+		<servlet-class>com.amarsoft.biz.workflow.graph.web.AddProcess</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>workflow_DeleteProcess</servlet-name>
+		<servlet-class>com.amarsoft.biz.workflow.graph.web.DeleteProcess</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>workflow_ListProcess</servlet-name>
+		<servlet-class>com.amarsoft.biz.workflow.graph.web.ListProcess</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>workflow_GetProcess</servlet-name>
+		<url-pattern>/getprocess.wf</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>workflow_UpdateProcess</servlet-name>
+		<url-pattern>/updateprocess.wf</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>workflow_AddProcess</servlet-name>
+		<url-pattern>/addprocess.wf</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>workflow_DeleteProcess</servlet-name>
+		<url-pattern>/deleteprocess.wf</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>workflow_ListProcess</servlet-name>
+		<url-pattern>/listprocess.wf</url-pattern>
+	</servlet-mapping>
+	<welcome-file-list id="WelcomeFileList_1">
+		<welcome-file>index.html</welcome-file>
+	</welcome-file-list>
+	<error-page>
+		<error-code>404</error-code>
+		<location>/Frame/page/sys/NoPageInfo.jsp</location>
+	</error-page>
+	<resource-ref id="ResourceRef_1">
+		<res-ref-name>jdbc/als</res-ref-name>
+		<res-type>javax.sql.DataSource</res-type>
+		<res-auth>Application</res-auth>
+		<res-sharing-scope>Shareable</res-sharing-scope>
+	</resource-ref>
+	<resource-ref id="ResourceRef_2">
+		<res-ref-name>jdbc/report</res-ref-name>
+		<res-type>javax.sql.DataSource</res-type>
+		<res-auth>Application</res-auth>
+		<res-sharing-scope>Shareable</res-sharing-scope>
+	</resource-ref>
+	<session-config>
+		<session-timeout>240</session-timeout>
+	</session-config>
+	<servlet>
+		<servlet-name>InitDBType</servlet-name>
+		<servlet-class>com.amarsoft.app.awe.config.InitDBType</servlet-class>
+		<init-param>
+			<param-name>shutdown-on-unload</param-name>
+			<param-value>true</param-value>
+		</init-param>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet>
+		<servlet-name>QuartzInitializer</servlet-name>
+		<servlet-class>com.tenwa.quartz.MyQuartzInitializerServlet</servlet-class>
+		<init-param>
+			<param-name>config-file</param-name>
+			<param-value>quartz.properties</param-value>
+		</init-param>
+		<init-param>
+			<param-name>shutdown-on-unload</param-name>
+			<param-value>true</param-value>
+		</init-param>
+		<load-on-startup>5</load-on-startup>
+	</servlet>
+	<context-param>
+		<param-name>webAppRootKey</param-name>
+		<param-value>webapp.port</param-value>
+	</context-param>
+	<context-param>
+		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+		<param-value>ApplicationResources</param-value>
+	</context-param>
+	<context-param>
+		<param-name>log4jConfigLocation</param-name>
+		<param-value>/WEB-INF/classes/log4j.xml</param-value>
+	</context-param>
+	<context-param>
+		<description>閰嶇疆鏂囦欢浣嶇疆</description>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>classpath:applicationContext*.xml</param-value>
+	</context-param>
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+
+	<!--- ================================== -->
+	<!-- webApi閰嶇疆 -->
+	<!--- ================================== -->
+	<!-- restfull杞彂澶勭悊鐨剆ervlet -->
+	<servlet>
+		<description>Restfull澶勭悊Servlet</description>
+		<display-name>RestfullServlet</display-name>
+		<servlet-name>RestfullServlet</servlet-name>
+		<!-- <servlet-class>cn.coyoteam.aweresf.web.servlet.RestfullServiceServlet</servlet-class> -->
+		<servlet-class>cn.servlet.RestfullServiceServlet</servlet-class>
+
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>RestfullServlet</servlet-name>
+		<url-pattern>/webapi/resf/*</url-pattern>
+	</servlet-mapping>
+	<context-param>
+		<description>restfull鑷姩鎵弿璺緞璁剧疆</description>
+		<param-name>RestfullScanPackage</param-name>
+		<param-value>
+	        apx.com.amarsoft.als.user.logon.controller,
+			apx.com.amarsoft.als.user.pwd.controller,
+			apx.com.amarsoft.als.user.sys.controller,
+			apx.com.amarsoft.als.doc.controller,
+			apx.com.amarsoft.als.currency.select.controller,
+			apx.com.amarsoft.als.currency.select.contract.controller,
+				<!-- 鎴戠殑宸ヤ綔 -->
+					<!-- 鐢宠鍒楄〃  锛� applytype phasetype ObjectNo -->
+					apx.com.amarsoft.als.apzl.apply.business.query.controller,
+					<!-- 涓氬姟鐢宠鍙戣捣 -->
+					apx.com.amarsoft.als.apzl.apply.business.start.controller,
+				<!-- 姹借溅閫夋嫨妗� -->
+					apx.com.amarsoft.als.currency.select.apzl.car.controller,
+				<!-- 浜у搧閫夋嫨妗� -->
+					apx.com.amarsoft.als.currency.select.apzl.product.controller,
+					
+				<!-- 鎰忚 -->	
+					<!-- 绛剧讲鎰忚 -->
+					apx.com.amarsoft.als.business.opinion.sign.controller,
+					<!-- 娴佺▼鍘嗗彶鎰忚 -->
+					apx.com.amarsoft.als.business.opinion.history.controller,
+				
+				<!-- 娴佺▼闄勪欢涓�瑙� -->
+					apx.com.amarsoft.als.business.attachment.controller,
+				
+				<!-- 娴佺▼鍔ㄤ綔 -->
+					apx.com.amarsoft.als.business.action.ready.controller,
+					apx.com.amarsoft.als.business.action.submit.controller,
+					apx.com.amarsoft.als.business.action.back.controller,
+					apx.com.amarsoft.als.business.comm.action.controller,
+					
+				<!-- 閫氱敤 鍒楄〃/琛ㄥ崟 鏌ヨ 淇濆瓨 澶勭悊 -->
+					<!-- 閫氱敤妯℃澘鏌ヨ 淇濆瓨 鍒楄〃 鍒犻櫎 澶勭悊 -->
+					apx.com.amarsoft.als.base.awe.controller,
+					<!-- 鎵ｆ鍗′俊鎭彉鏇�-->
+					apx.com.amarsoft.als.business.change.controller,
+					<!-- 淇℃伅鏍￠獙-->
+					apx.com.amarsoft.als.business.verification.controller,
+    </param-value>
+	</context-param>
+	<!-- 瀵规暣涓獁ebapi杩涜涓�浜涢�氱敤澶勭悊鐨勮繃婊ゅ櫒 -->
+	<filter>
+		<display-name>SessionAndContextFilter</display-name>
+		<filter-name>SessionAndContextFilter</filter-name>
+		<!-- <filter-class>cn.coyoteam.aweresf.web.filter.SessionAndContextFilter</filter-class> -->
+		<filter-class>cn.filter.SessionAndContextFilter</filter-class>
+		<init-param>
+			<param-name>NoCheckURI</param-name>
+			<param-value>
+             	<!-- 鐢ㄦ埛 鐧诲綍/娉ㄩ攢 -->
+					/resf/logon/manager/logon, 
+					/resf/logon/manager/logout,
+				<!-- 鍏抽棴鎵嬪娍瀵嗙爜  鏌ヨ鎵嬪娍瀵嗙爜鐘舵�� -->
+					/resf/user/center/manager/acquisition/gesture, 
+					/resf/user/center/manager/close/gesture,
+				<!-- 妫�娴嬬郴缁� 鐗堟湰 -->
+					/resf/user/center/manager/detection/version,
+				<!-- 涓嬭浇 --> 
+					/resf/files/down/docById,
+					/resf/files/downloadPlist,
+					/resf/files/downloadApp,
+					/resf/files/downloadAppById,
+        </param-value>
+		</init-param>
+		<init-param>
+			<param-name>TokenHoldTime</param-name>
+			<param-value>31536000</param-value><!-- 3600*24*365=31536000 -->
+		</init-param>
+		<init-param>
+			<param-name>dataSource</param-name>
+			<param-value>als</param-value>
+		</init-param>
+		<init-param>
+			<param-name>encoding</param-name>
+			<param-value>GBK</param-value>
+		</init-param>
+	</filter>
+	<filter-mapping>
+		<filter-name>SessionAndContextFilter</filter-name>
+		<url-pattern>/webapi/*</url-pattern>
+	</filter-mapping>
+	<!--- ================================== -->
+	<!-- 鏀寔webapi-缁撴潫 -->
+	<!--- ================================== -->
 </web-app>
\ No newline at end of file
diff --git a/config/quartz.properties b/config/quartz.properties
index a92309abb..8e6950a7f 100644
--- a/config/quartz.properties
+++ b/config/quartz.properties
@@ -1,44 +1,44 @@
-org.quartz.dataSource.zhulhDS.URL=jdbc:mysql://localhost:3306/apzl?rewriteBatchedStatements=true&useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnect=true
-#tel6
-#org.quartz.dataSource.zhulhDS.user=2sHTLrRv8sRxxaX7RrjfKQ==
-#tel6_123
-#org.quartz.dataSource.zhulhDS.key=LR8hbgC5Gwc920lYM5vH8g==
-#apzl
-org.quartz.dataSource.zhulhDS.user=338A48E135315FDBC2DF24EB080903D7
-#apzl@2018
-org.quartz.dataSource.zhulhDS.key=431DC9744DEF477868F97C4842F87AB3
-org.quartz.dataSource.zhulhDS.driver=com.mysql.jdbc.Driver
-c3p0.minPoolSize=5
-c3p0.maxPoolSize=400
-c3p0.initialPoolSize=10
-c3p0.maxIdleTime=60
-c3p0.acquireIncrement=5
-c3p0.maxStatements=0
-c3p0.checkoutTimeout=0
-c3p0.breakAfterAcquireFailure=false
-c3p0.testConnectionOnCheckout=false
-c3p0.testConnectionOnCheckin=false
-c3p0.idleConnectionTestPeriod=60
-c3p0.acquireRetryAttempts=10
-c3p0.acquireRetryDelay=1000
-c3p0.preferredTestQuery=select 1
-
-org.quartz.scheduler.skipUpdateCheck=true
-#QuartzScheduler
-org.quartz.scheduler.instanceName=zhouyh
-org.quartz.scheduler.instanceId=AUTO
-org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
-org.quartz.threadPool.threadCount=50
-org.quartz.threadPool.threadPriority=4 
-org.quartz.jobStore.misfireThreshold=500
-org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreTX
-org.quartz.jobStore.dataSource=zhulhDS
-org.quartz.dataSource.zhulhDS.connectionProvider.class=com.tenwa.quartz.MyPoolingConnectionProvider
-org.quartz.jobStore.tablePrefix=QRTZ_
-org.quartz.jobStore.isClustered=false
-org.quartz.jobStore.clusterCheckinInterval=15000 
-org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-org.quartz.dataSource.zhulhDS.maxConnections=50
-
-#control distributor(temporary)
+org.quartz.dataSource.zhulhDS.URL=jdbc:mysql://localhost:3306/apzl?rewriteBatchedStatements=true&useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnect=true
+#tel6
+#org.quartz.dataSource.zhulhDS.user=2sHTLrRv8sRxxaX7RrjfKQ==
+#tel6_123
+#org.quartz.dataSource.zhulhDS.key=LR8hbgC5Gwc920lYM5vH8g==
+#apzl
+org.quartz.dataSource.zhulhDS.user=338A48E135315FDBC2DF24EB080903D7
+#apzl@2018
+org.quartz.dataSource.zhulhDS.key=431DC9744DEF477868F97C4842F87AB3
+org.quartz.dataSource.zhulhDS.driver=com.mysql.jdbc.Driver
+c3p0.minPoolSize=5
+c3p0.maxPoolSize=400
+c3p0.initialPoolSize=10
+c3p0.maxIdleTime=60
+c3p0.acquireIncrement=5
+c3p0.maxStatements=0
+c3p0.checkoutTimeout=0
+c3p0.breakAfterAcquireFailure=false
+c3p0.testConnectionOnCheckout=false
+c3p0.testConnectionOnCheckin=false
+c3p0.idleConnectionTestPeriod=60
+c3p0.acquireRetryAttempts=10
+c3p0.acquireRetryDelay=1000
+c3p0.preferredTestQuery=select 1
+
+org.quartz.scheduler.skipUpdateCheck=true
+#QuartzScheduler
+org.quartz.scheduler.instanceName=zhouyh
+org.quartz.scheduler.instanceId=AUTO
+org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
+org.quartz.threadPool.threadCount=50
+org.quartz.threadPool.threadPriority=4 
+org.quartz.jobStore.misfireThreshold=500
+org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreTX
+org.quartz.jobStore.dataSource=zhulhDS
+org.quartz.dataSource.zhulhDS.connectionProvider.class=com.tenwa.quartz.MyPoolingConnectionProvider
+org.quartz.jobStore.tablePrefix=QRTZ_
+org.quartz.jobStore.isClustered=false
+org.quartz.jobStore.clusterCheckinInterval=15000 
+org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+org.quartz.dataSource.zhulhDS.maxConnections=50
+
+#control distributor(temporary)
 distributor_role = 401
\ No newline at end of file
diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java
index 4a0683d10..91551296b 100644
--- a/src/com/tenwa/channelportal/action/ContractSignAction.java
+++ b/src/com/tenwa/channelportal/action/ContractSignAction.java
@@ -207,6 +207,7 @@ public class ContractSignAction{
 				String docName = keys.getAttribute("DOC_NAME").toString();
 				// 自然人和调查表
 				String info = keys.getAttribute("CUSTOMERNAME").toString() + "@" + keys.getAttribute("TELEPHONE").toString();
+//				String info = "唐福堂@18516860186,朱荟辰@17778045090";
 				List<ContractSignInfo> list = map.get(info);
 				if (list == null) {
 					list = new ArrayList<ContractSignInfo>();
diff --git a/src/com/tenwa/channelportal/action/generativecontract/WordToPDFUtil.java b/src/com/tenwa/channelportal/action/generativecontract/WordToPDFUtil.java
index a44cb4aa4..18b682708 100644
--- a/src/com/tenwa/channelportal/action/generativecontract/WordToPDFUtil.java
+++ b/src/com/tenwa/channelportal/action/generativecontract/WordToPDFUtil.java
@@ -4,6 +4,8 @@ import java.io.File;
 import java.io.InputStreamReader;
 
 import org.apache.log4j.Logger;
+
+import com.tenwa.httpclient.resources.QuartzPropertiesUtil;
 public class WordToPDFUtil {
 	private  static Logger logger = Logger.getLogger(WordToPDFUtil.class);
 	// 将word格式的文件转换为pdf格式
@@ -24,8 +26,10 @@ public class WordToPDFUtil {
 			 long start= System.currentTimeMillis();
 			 logger.info("============转换pdf开始============");
 	         try{
-				 String cmd = "C:\\Program Files\\LibreOffice 5\\program\\soffice --headless -invisible --convert-to pdf "+srcPath+" --outdir "+desPath;
-				 logger.info("python:"+cmd);
+	        	 String path = QuartzPropertiesUtil.get("libreOffice_path");
+//				 String cmd = "/opt/libreoffice5.4/program/soffice --headless -invisible --convert-to pdf "+srcPath+" --outdir "+desPath;
+	        	 String cmd = path+"\\soffice --headless -invisible --convert-to pdf "+srcPath+" --outdir "+desPath;
+	        	 logger.info("python:"+cmd);
 				 process = Runtime.getRuntime().exec(cmd);
 				 String cmdMsg = "";
 				 BufferedReader bufferedReader = new BufferedReader( new InputStreamReader(process.getInputStream()));
diff --git a/src_tenwa/com/tenwa/action/channelportal/businesshanding/contractaward/ContractAward.java b/src_tenwa/com/tenwa/action/channelportal/businesshanding/contractaward/ContractAward.java
index 626f4d454..4fb530658 100644
--- a/src_tenwa/com/tenwa/action/channelportal/businesshanding/contractaward/ContractAward.java
+++ b/src_tenwa/com/tenwa/action/channelportal/businesshanding/contractaward/ContractAward.java
@@ -10,6 +10,7 @@ import jbo.app.tenwa.doc.LB_DOCATTRIBUTE;
 import jbo.app.tenwa.doc.LB_DOCLIBRARY;
 import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST;
 import jbo.com.tenwa.lease.carbrand.BUSINESS_STATUS;
+import jbo.com.tenwa.lease.carbrand.VI_CONTRACTMAKEPRINTLIST;
 import jbo.com.tenwa.lease.comm.LB_CONTRACT_STATUS;
 import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO;
 import jbo.sys.CHANNEL_SUBMIT_APPLICATIONS;
@@ -262,15 +263,21 @@ public void setProject_id(String project_id) {
     	BizObjectManager bom = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME,tx);
     	BizObjectManager bomstatus = JBOFactory.getBizObjectManager(LB_CONTRACT_STATUS.CLASS_NAME,tx);
     	BizObjectManager ldclBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME,tx);
+    	BizObjectManager vc = JBOFactory.getBizObjectManager(VI_CONTRACTMAKEPRINTLIST.CLASS_NAME,tx);
     	Boolean flag=false;
+    	Boolean unflag=true;
         List<BizObject> ldclBo = ldclBom.createQuery("project_id='"+project_id+"' and file_flag='yes' and sendprocess='1'").getResultList(false);
         if(ldclBo.size()>0){
     	  flag=true;
     	}
-    	BizObject bo=bom.createQuery("id='"+project_id+"'").getSingleResult(false);
+        List<BizObject> vcs = vc.createQuery("id=:projectid and flowunid=:flowunid").setParameter("projectid", project_id).setParameter("flowunid", FlowUnid).getResultList(false);
+        if(vcs.size()>0){
+        	unflag=false;
+      	}
+        BizObject bo=bom.createQuery("id='"+project_id+"'").getSingleResult(false);
     	BizObject bostatus=bomstatus.createQuery("status_code='"+bo.getAttribute("PROJECT_STATUS").toString()+"'").getSingleResult(false);
     	String projstatus=bostatus!=null?bostatus.getAttribute("STATUS_NAME").toString():"";
-    	return bo.getAttribute("PROJECT_STATUS").toString()+"@"+projstatus+"@"+flag;
+    	return bo.getAttribute("PROJECT_STATUS").toString()+"@"+projstatus+"@"+flag+"@"+unflag;
     }
     
     public String customerinfo(JBOTransaction tx) throws JBOException, SQLException{