diff --git a/WebContent/404.html b/WebContent/404.html
new file mode 100644
index 000000000..04f59e365
--- /dev/null
+++ b/WebContent/404.html
@@ -0,0 +1,35 @@
+
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="gb2312" />
+<meta name="viewport" content="initial-scale=1,maximum-scale=1,user-scalable=no,width=device-width,height=device-height">
+<meta name="format-detection" content="telephone=no" />
+<meta http-equiv="Cache-Control" content="no-transform" />
+<title>App应用下载</title>
+<meta name="keywords" content="" />
+<meta name="description" content="" />
+<script type="text/javascript" src="${pageContext.request.contextPath}/js/jquery/jquery-1.11.0.min.js"></script>
+<style type="text/css">
+#weixin-tip{display:none;position:fixed;left:0;top:0;background:rgba(0,0,0,0.8);filter:alpha(opacity=80);width:100%;height:100%;z-index:100;}
+#weixin-tip p{text-align:center;margin-top:10%;padding:0 5%;position:relative;}
+#weixin-tip .close{color:#fff;padding:5px;font:bold 20px/24px simsun;text-shadow:0 1px 0 #ddd;position:absolute;top:0;left:5%;}
+.butonpanle{width: 100%;margin-top:10%; height: 20%}
+.android-btn{width:80%;height: 30%;padding-top: 2%;padding-bottom: 3%;border:0.5;background-color: #8DB6CD;color:white;fount-size:16;display: block;margin: 0 auto;}
+img{display: block;margin: 0 auto;}
+#tips{margin: 0 auto;width: 100%;color:red; white-space: pre-wrap; text-align: center;}
+</style>
+</head>
+<body style="background-color: #F4F4F4;width: 100%;text-align: center">
+    <div id="img-content">
+    	<h3>404</h3>
+    	<hr>
+    	下载文件不存在!
+    <br/>
+    <label id="tips"></label>
+    </div>
+    <div id="weixin-tip">
+    <p><img src="${pageContext.request.contextPath}/image/down_wx_t.png" alt="微信扫描打开APP下载链接提示代码优化" alt="微信打开"/>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/WebContent/406.html b/WebContent/406.html
new file mode 100644
index 000000000..e8a5ec03e
--- /dev/null
+++ b/WebContent/406.html
@@ -0,0 +1,35 @@
+
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="gb2312" />
+<meta name="viewport" content="initial-scale=1,maximum-scale=1,user-scalable=no,width=device-width,height=device-height">
+<meta name="format-detection" content="telephone=no" />
+<meta http-equiv="Cache-Control" content="no-transform" />
+<title>南方租赁</title>
+<meta name="keywords" content="" />
+<meta name="description" content="" />
+<script type="text/javascript" src="${pageContext.request.contextPath}/js/jquery/jquery-1.11.0.min.js"></script>
+<style type="text/css">
+#weixin-tip{display:none;position:fixed;left:0;top:0;background:rgba(0,0,0,0.8);filter:alpha(opacity=80);width:100%;height:100%;z-index:100;}
+#weixin-tip p{text-align:center;margin-top:10%;padding:0 5%;position:relative;}
+#weixin-tip .close{color:#fff;padding:5px;font:bold 20px/24px simsun;text-shadow:0 1px 0 #ddd;position:absolute;top:0;left:5%;}
+.butonpanle{width: 100%;margin-top:10%; height: 20%}
+.android-btn{width:80%;height: 30%;padding-top: 2%;padding-bottom: 3%;border:0.5;background-color: #8DB6CD;color:white;fount-size:16;display: block;margin: 0 auto;}
+img{display: block;margin: 0 auto;}
+#tips{margin: 0 auto;width: 100%;color:red; white-space: pre-wrap; text-align: center;}
+</style>
+</head>
+<body style="background-color: #F4F4F4;width: 100%;text-align: center">
+    <div id="img-content">
+    	<h3>406</h3>
+    	<hr>
+    	当前为APP服务，WEB无效访问权限!
+    <br/>
+    <label id="tips"></label>
+    </div>
+    <div id="weixin-tip">
+    <p><img src="${pageContext.request.contextPath}/image/down_wx_t.png" alt="微信扫描打开APP下载链接提示代码优化" alt="微信打开"/>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/a3web.xml b/WebContent/WEB-INF/etc/a3web.xml
index cfbb717f9..c44c01b79 100644
--- a/WebContent/WEB-INF/etc/a3web.xml
+++ b/WebContent/WEB-INF/etc/a3web.xml
@@ -7,14 +7,14 @@
 
 	<DataSource>als</DataSource>
 	<DataSource_Report>als_rpt</DataSource_Report>
-	
+
 	<!--TranDebugMode Remark 0:不输出Sql运行信息,1:输出Sql运行信息 -->
 	<TranDebugMode>1</TranDebugMode>
 	<!--StatementMode Remark 查询SQL游标模式 0:Statement,1: prepareStatement -->
 	<StatementMode>1</StatementMode>
 	<!--DBChange Remark 1:GBK->ISO8859_1,2:NoChange,3:ISO8859_1->GBK -->
 	<DBChange>2</DBChange>
-  
+
 	<AmarDWChange>1</AmarDWChange>
 	<AmarDWMaxRows>1000000</AmarDWMaxRows>
 	<AmarDWDefPageSize>20</AmarDWDefPageSize>
@@ -26,7 +26,7 @@
 	<RunMode>Development</RunMode>
 	<!--FileSaveMode Remark Table：存放在数据库；Disk：存放在文件服务器 -->
 	<FileSaveMode>Disk</FileSaveMode>
-	<!--为满足程序和文档分开的需要，下面指定的文档保存、下载路径一般都为绝对路径-->
+	<!--为满足程序和文档分开的需要，下面指定的文档保存、下载路径一般都为绝对路径 -->
 	<!--FileSavePath Remark 文件保存路径 在FileSaveMode为Disk指定，如果指定目录不存在则保存在WEB-INF的Upload下 -->
 	<FileSavePath>d:/tmp/als/Upload</FileSavePath>
 	<!--文件模板位置 -->
@@ -36,7 +36,8 @@
 	<!--WorkDocSaveMode Remark Table：存放在数据库；Disk：存放在文件服务器 -->
 	<WorkDocSaveMode>Disk</WorkDocSaveMode>
 	<!--WorkDocOfflineSavePath Remark 离线格式化报告存储位置 -->
-	<WorkDocOfflineSavePath>/tmp/als/offlineworkdoc</WorkDocOfflineSavePath>
+	<WorkDocOfflineSavePath>/tmp/als/offlineworkdoc
+	</WorkDocOfflineSavePath>
 
 	<!--DWDownloadFilePath 表示DataWindow下载的文件存放的服务器位置，必须以/表示目录分割符 -->
 	<DWDownloadFilePath>/tmp/DownLoad</DWDownloadFilePath>
@@ -48,10 +49,10 @@
 	<FileNameType>SRC</FileNameType>
 	<!-- OW列表模糊查询 -->
 	<ListFuzzyQuery>true</ListFuzzyQuery>
-	
+
 	<!-- 异步查询导出文件路径 -->
 	<SynchQueryFilePath>/home/amarsoft/als/Download</SynchQueryFilePath>
-	
+
 	<!-- 是否从文件读取语言翻译 -->
 	<File4Language>true</File4Language>
 	<!-- 是否自动生成语言文件，开发环境设为true，生产或演示模式设为false -->
@@ -68,35 +69,46 @@
 	<ImplementationName>Leasing Cloud</ImplementationName>
 	<ImplementationVersion></ImplementationVersion>
 	<BankName>安硕</BankName>
-	
+
 	<!-- =========================================业务配置 - begin======================================= -->
 	<!--根据ApporveNeed的配置判断是否登记最终审批意见：true-登记最终审批意见，false-不登记最终审批 意见 -->
 	<ApproveNeed>true</ApproveNeed>
-	
+
 	<!--ClassifyObjectType Remark BusinessDueBill:五级分类按借据,BusinessContract:五级分类按合同 -->
 	<ClassifyObjectType>BusinessDueBill</ClassifyObjectType>
 	<!-- =========================================业务配置 - end ========================================= -->
 	<ReportServer>http://localhost:8080/report</ReportServer>
 	<ReportOutServer>http://localhost:8080/report</ReportOutServer>
-	
+
 	<!-- =========================================APP推送配置 - begin ========================================= -->
 	<IS_PUSH>true</IS_PUSH>
 	<APP_SECRET_KEY>WZ5jwvsdAFzo+sDY7wrZgA==</APP_SECRET_KEY>
 	<MY_PACKAGE_NAME>com.tenwa.sinopharmEleasing</MY_PACKAGE_NAME>
 	<APP_SECRET_KEY_IOS>rfL+5IFP/fHrsIiCZlJu5Q==</APP_SECRET_KEY_IOS>
 	<!-- =========================================APP推送配置 - begin ========================================= -->
-	
-	
+
+
 	<!-- =======车300接口===== -->
 	<CAR_TOKEN>ee450692cbd24e8bacb27b6f46b4d752</CAR_TOKEN>
-    <CAR_BRAND>http://api.che300.com/service/getCarBrandList</CAR_BRAND>
-    <CAR_BRAND_SERIES>http://api.che300.com/service/getCarSeriesList</CAR_BRAND_SERIES>
-    <CAR_BRAND_MODEL>http://api.che300.com/service/getCarModelList</CAR_BRAND_MODEL>
-    <CAR_NEW_PRICE>http://api.che300.com/service/getNewCarPrice</CAR_NEW_PRICE>
-    <USED_CAR_PRICE>http://api.che300.com/service/getUsedCarPrice</USED_CAR_PRICE>
-    
-    <!-- ==================================(Hession推送配置 Springboot) ========================================= -->
-   <!-- <RequestHessionUrl>http://localhost:8080/skeleton/remoting/api</RequestHessionUrl>-->
-    <RequestHessionUrl>http://111.205.51.131:27203/clms_proxy/remoting/api</RequestHessionUrl>
-   <!--  <RequestHessionUrl>http://192.168.7.2:9090/HttpRequestAppService</RequestHessionUrl> -->
+	<CAR_BRAND>http://api.che300.com/service/getCarBrandList</CAR_BRAND>
+	<CAR_BRAND_SERIES>http://api.che300.com/service/getCarSeriesList
+	</CAR_BRAND_SERIES>
+	<CAR_BRAND_MODEL>http://api.che300.com/service/getCarModelList
+	</CAR_BRAND_MODEL>
+	<CAR_NEW_PRICE>http://api.che300.com/service/getNewCarPrice
+	</CAR_NEW_PRICE>
+	<USED_CAR_PRICE>http://api.che300.com/service/getUsedCarPrice
+	</USED_CAR_PRICE>
+
+	<!-- ==================================(Hession推送配置 Springboot) ========================================= -->
+	<!-- <RequestHessionUrl>http://localhost:8080/skeleton/remoting/api</RequestHessionUrl> -->
+	<RequestHessionUrl>http://111.205.51.131:27203/clms_proxy/remoting/api
+	</RequestHessionUrl>
+	<!-- <RequestHessionUrl>http://192.168.7.2:9090/HttpRequestAppService</RequestHessionUrl> -->
+
+	<!--AppConfigPath Remark Table：app_config.properties路径 -->
+	<!-- <AppConfigPath>C:/Users/admin/git/TEL6_V1.0/WebContent/WEB-INF/etc/app_config.properties</AppConfigPath> -->
+	<!-- <AppConfigPath>/soft/apache-tomcat-8.0.47-8081-nfzl/webapps/nfzl/WEB-INF/etc/app_config.properties</AppConfigPath> -->
+	<!-- 本地 -->
+	<AppConfigPath>/etc/app_config.properties</AppConfigPath>
 </Domain>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/app_config.properties b/WebContent/WEB-INF/etc/app_config.properties
new file mode 100644
index 000000000..6d952ba65
--- /dev/null
+++ b/WebContent/WEB-INF/etc/app_config.properties
@@ -0,0 +1,69 @@
+###############################################################################
+#  APP_CONFIG properties
+###############################################################################
+
+###############################################################################
+# APP_BASE_CONFIG
+###############################################################################
+# base.data.
+base.data.source=als
+base.data.encoding=UTF-8
+base.data.fource.encoding=true
+
+# base.param.key.
+base.param.key.hold.time=TokenHoldTime
+base.param.key.encoding=encoding
+base.param.key.no.check.uri=NoCheckURI
+
+# session check.
+base.session.check.token=token
+base.session.check.user.id=userid
+base.session.check.dev.id=devid
+base.session.check.dev.os=devos
+base.session.check.expire=expire
+
+# session.
+base.session.web.api.page=WebApiPage
+base.session.req.uri=ReqURI
+
+# base.return.
+base.return.code.500=500
+base.return.msg.500=\u540E\u53F0\u670D\u52A1\u51FA\u73B0\u5F02\u5E38!
+base.return.code.404=404
+base.return.code.406=406
+base.return.msg.406=\u8BBF\u95EE\u670D\u52A1\u540E\u53F0\u6743\u9650\u65E0\u6548!
+base.return.result.success.code=SUCCESS
+base.return.result.fail.code=FAIL
+base.return.msg.save.fail=\u4FDD\u5B58\u5931\u8D25
+base.return.msg.save.success=\u4FDD\u5B58\u6210\u529F
+base.return.msg.edit.fail=\u7F16\u8F91\u5931\u8D25
+base.return.msg.edit.success=\u7F16\u8F91\u6210\u529F
+base.return.msg.del.fail=\u5220\u9664\u5931\u8D25
+base.return.msg.del.success=\u5220\u9664\u6210\u529F
+base.return.msg.init.display.fail=\u521D\u59CB\u5316\u9875\u9762\u5931\u8D25
+base.return.msg.init.display.success=\u521D\u59CB\u5316\u9875\u9762\u6210\u529F
+
+base.return.type.void=void
+base.return.type.app.att=AppAtt
+
+# base pwd encryption des.
+base.pwd.encryption.des.one=0123456789abc
+base.pwd.encryption.des.two=1234567890abc
+base.pwd.encryption.des.three=1234567890!@#
+
+# customer type
+base.customer.type.company=01
+base.customer.type.person=03
+
+
+###############################################################################
+# APP_PUSH_MESSAGE_CONFIG
+###############################################################################
+push.message.switch=true
+push.message.secret.key.android=xpStkADS2IUJk10PejtJvQ==
+push.message.secret.key.ios=WZ5jwvsdAFzo+sDY7wrZgA==
+push.message.package.name=com.tenwa.test
+
+
+#base.filter.user.role.id='800090001R00000004','800090001R00000005','099','299','399','800090001R00000010','800090002R00000001','800090002R00000003','800090002R00000045','800090001R00000006','800090001R00000007','800090001R00000008','800090001R00000009','800090001R00000013','800090001R00000014','800090001R00000022','800090001R00000019','800090001R00000020','800090001R00000015','800090001R00000025'
+base.filter.user.role.id=none
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/are.xml b/WebContent/WEB-INF/etc/are.xml
index 8f2221d23..40423d160 100644
--- a/WebContent/WEB-INF/etc/are.xml
+++ b/WebContent/WEB-INF/etc/are.xml
@@ -76,6 +76,7 @@
 				<Property name="com.amarsoft.are.jbo.impl.DefaultXMLJBOFactory.configFile" 
 					value="{$ARE.APP_HOME}/etc/jbo/jbomanagers.xml,
 							{$ARE.APP_HOME}/etc/jbo/jbo_app.xml,
+							{$ARE.APP_HOME}/etc/jbo/jbo_app_fresh.xml,
 							{$ARE.APP_HOME}/etc/jbo/jbo_awe.xml,
 							{$ARE.APP_HOME}/etc/jbo/jbo_oti.xml,
 							{$ARE.APP_HOME}/etc/jbo/jbo_sys.xml,
diff --git a/WebContent/WEB-INF/etc/cache.xml b/WebContent/WEB-INF/etc/cache.xml
index 379f3638b..9bf3177b2 100644
--- a/WebContent/WEB-INF/etc/cache.xml
+++ b/WebContent/WEB-INF/etc/cache.xml
@@ -1,24 +1,43 @@
 <?xml version="1.0" encoding="GB2312"?>
 <CacheConfig dbname="als" Version="1.0.0.0">
-	<cache name="代码表" loadClass="com.amarsoft.dict.als.cache.loader.CodeLoader"/>
-	<cache name="业务对象" loadClass="com.amarsoft.dict.als.cache.loader.ObjectTypeLoader"/>
-    <cache name="菜单" loadClass="com.amarsoft.dict.als.cache.loader.AWEMenuLoader"/>
-    <cache name="子系统" loadClass="com.amarsoft.dict.als.cache.loader.AWEAppLoader"/>
-    <cache name="URL控制表" loadClass="com.amarsoft.dict.als.cache.loader.AWEHrefLoader"/>
-    <cache name="功能点URL控制表" loadClass="com.amarsoft.dict.als.cache.loader.AWEFuncHrefLoader"/>
-	<cache name="角色" loadClass="com.amarsoft.dict.als.cache.loader.AWERoleLoader"/>
-    <cache name="名称对照" loadClass="com.amarsoft.dict.als.cache.loader.NameLoader" size="1000" expireTime="600"/>
-    <cache name="错误代码信息" loadClass="com.amarsoft.dict.als.cache.loader.ErrMsgLoader"/>
-    <cache name="ObjectWindow缓存" loadClass="com.amarsoft.dict.als.cache.loader.AWEDataWindowLoader" size="50" expireTime="1200"/> 
-    <cache name="JBO关联对象缓存" loadClass="com.amarsoft.asquery.JBORelatedObjLoader"/>
-    <!-- 
-    <cache name="APP_CODE缓存" loadClass="apx.com.amarsoft.als.base.constant.cache.loader.AppCodeLoader"/>
-    <cache name="APP_DO缓存" loadClass="apx.com.amarsoft.als.base.constant.cache.loader.AppAweDoLoader" size="10000" />
-    <cache name="SYSCONF_CLTYPE" loadClass="com.amarsoft.app.creditline.cache.loader.CreditLineTypeDefinitionLoader"/>额度类型信息
-    <cache name="SYSCONF_LIMITATIONTYPE" loadClass="com.amarsoft.app.creditline.cache.loader.LimitationTypeDefinitionLoader"/>额度限制类型信息
-    <cache name="SYSCONF_CL_ERROR_TYPE" loadClass="com.amarsoft.app.creditline.cache.loader.ErrorTypeDefinitionLoader"/>额度异常点类型信息
-     -->
-     <!-- 新增核算cache -->
-      <cache name="核算交易定义" loadClass="com.amarsoft.app.als.sys.SystemConfigLoader"/>
-      <cache name="产品参数" loadClass="com.amarsoft.app.als.prd.config.loader.ProductConfigLoader"/>
+
+	<!-- app cache -->
+	<cache name="APP_CONFIG缓存"
+		loadClass="apx.com.amarsoft.als.base.cache.loader.AppConfigLoader" />
+	<cache name="APP_CODE缓存"
+		loadClass="apx.com.amarsoft.als.base.cache.loader.AppCodeLoader" size="1000000"
+		expireTime="600" />
+	<!-- 备注：元代买注释 解放启动时间 -->
+	<cache name="APP_DO缓存"
+		loadClass="apx.com.amarsoft.als.base.cache.loader.AppAweDoLoader"
+		size="1000000" expireTime="600" />
+	<!-- 备注：国家行业map注释 解放启动时间 -->
+	<cache name="APP_Constant缓存"
+		loadClass="apx.com.amarsoft.als.base.cache.loader.AppConstantLoader" />
+
+	<cache name="代码表" loadClass="com.amarsoft.dict.als.cache.loader.CodeLoader" />
+	<cache name="业务对象" loadClass="com.amarsoft.dict.als.cache.loader.ObjectTypeLoader" />
+	<cache name="菜单" loadClass="com.amarsoft.dict.als.cache.loader.AWEMenuLoader" />
+	<cache name="子系统" loadClass="com.amarsoft.dict.als.cache.loader.AWEAppLoader" />
+	<cache name="URL控制表" loadClass="com.amarsoft.dict.als.cache.loader.AWEHrefLoader" />
+	<cache name="功能点URL控制表"
+		loadClass="com.amarsoft.dict.als.cache.loader.AWEFuncHrefLoader" />
+	<cache name="角色" loadClass="com.amarsoft.dict.als.cache.loader.AWERoleLoader" />
+	<cache name="名称对照" loadClass="com.amarsoft.dict.als.cache.loader.NameLoader"
+		size="1000" expireTime="600" />
+	<cache name="错误代码信息" loadClass="com.amarsoft.dict.als.cache.loader.ErrMsgLoader" />
+	<cache name="ObjectWindow缓存"
+		loadClass="com.amarsoft.dict.als.cache.loader.AWEDataWindowLoader"
+		size="50" expireTime="1200" />
+	<cache name="JBO关联对象缓存" loadClass="com.amarsoft.asquery.JBORelatedObjLoader" />
+	<!-- <cache name="APP_CODE缓存" loadClass="apx.com.amarsoft.als.base.constant.cache.loader.AppCodeLoader"/> 
+		<cache name="APP_DO缓存" loadClass="apx.com.amarsoft.als.base.constant.cache.loader.AppAweDoLoader" 
+		size="10000" /> <cache name="SYSCONF_CLTYPE" loadClass="com.amarsoft.app.creditline.cache.loader.CreditLineTypeDefinitionLoader"/>额度类型信息 
+		<cache name="SYSCONF_LIMITATIONTYPE" loadClass="com.amarsoft.app.creditline.cache.loader.LimitationTypeDefinitionLoader"/>额度限制类型信息 
+		<cache name="SYSCONF_CL_ERROR_TYPE" loadClass="com.amarsoft.app.creditline.cache.loader.ErrorTypeDefinitionLoader"/>额度异常点类型信息 -->
+	<!-- 新增核算cache -->
+	<cache name="核算交易定义" loadClass="com.amarsoft.app.als.sys.SystemConfigLoader" />
+	<cache name="产品参数"
+		loadClass="com.amarsoft.app.als.prd.config.loader.ProductConfigLoader" />
+
 </CacheConfig>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app_fresh.xml b/WebContent/WEB-INF/etc/jbo/jbo_app_fresh.xml
new file mode 100644
index 000000000..2f914758f
--- /dev/null
+++ b/WebContent/WEB-INF/etc/jbo/jbo_app_fresh.xml
@@ -0,0 +1,407 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbo>
+	<package name="jbo.app" label="搴旂敤鐩稿叧閰嶇疆">
+
+		<class name="TOKEN_SESSION" label="鎵嬫満鐧诲綍璁板綍" keyAttributes="TOKEN">
+			<attributes>
+				<attribute name="TOKEN" label="TOKEN" type="STRING"
+					length="255" />
+				<attribute name="USER_ID" label="鐢ㄦ埛璇嗗埆鍙�" type="STRING"
+					length="32" />
+				<attribute name="DEV_ID" label="璁惧璇嗗埆鍙�" type="STRING"
+					length="255" />
+				<attribute name="DEV_OS" label="璁惧绯荤粺绫诲埆" type="STRING"
+					length="255" />
+				<attribute name="CREATED" label="鍒涘缓鏃堕棿" type="STRING"
+					length="40" />
+				<attribute name="EXPIRE_IN" label="鏇存柊鏃堕棿" type="STRING"
+					length="40" />
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="createKey" value="true" />
+					<property name="table" value="TOKEN_SESSION" />
+				</managerProperties>
+			</manager>
+		</class>
+
+		<class name="APP_DO_CATALOG" label="妯℃澘褰�" keyAttributes="DONO">
+			<attributes>
+				<attribute name="DONO" label="妯℃澘鍙�" type="STRING" length="32" />
+				<attribute name="DONAME" label="妯℃澘CODE" type="STRING"
+					length="100" />
+			</attributes>
+		</class>
+
+		<class name="AWE_DO_GROUP" label="妯℃澘鍒嗙粍" keyAttributes="dono">
+			<attributes>
+				<attribute name="DONO" label="妯℃澘鍙�" type="STRING" length="32" />
+				<attribute name="DOCKID" label="鍒嗙粍缂栧彿" type="STRING"
+					length="32" />
+				<attribute name="DOCKNAME" label="鍒嗙粍鍚�" type="STRING"
+					length="80" />
+				<attribute name="SORTNO" label="鎺掑簭鍙�" type="STRING" length="100" />
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="AWE_DO_GROUP" />
+				</managerProperties>
+			</manager>
+		</class>
+
+		<class name="AWE_DO_LIBRARY" label="妯℃澘搴�" keyAttributes="dono">
+			<attributes>
+				<attribute name="dono" label="妯℃澘鍙�" type="String" length="400" />
+				<attribute name="colindex" label="瀛楁绱㈠紩" type="String"
+					length="400" />
+				<attribute name="sortno" label="瀛楁鎺掑簭" type="String"
+					length="400" />
+				<attribute name="isinuse" label="鏄惁搴熷純" type="String"
+					length="400" />
+				<attribute name="coltablename" label="鏁版嵁琛ㄥ悕" type="String"
+					length="400" />
+				<attribute name="colactualname" label="鏁版嵁搴撴簮鍚�" type="String"
+					length="400" />
+				<attribute name="colname" label="浣跨敤鍚嶇О" type="String"
+					length="400" />
+				<attribute name="coltype" label="鍊肩被鍨�" type="String"
+					length="400" />
+				<attribute name="coldefaultvalue" label="缂虹渷鍊�" type="String"
+					length="400" />
+				<attribute name="colheader" label="鍐呯疆鎸夐挳浜嬩欢" type="String"
+					length="400" />
+				<attribute name="colunit" label="涓枃鍚嶇О" type="String"
+					length="400" />
+				<attribute name="colcolumntype" label="鏄惁姹囨€�" type="String"
+					length="400" />
+				<attribute name="coleditstyle" label="缂栬緫褰㈠紡" type="String"
+					length="400" />
+				<attribute name="colcheckformat" label="鏍￠獙鏍峰紡" type="String"
+					length="400" />
+				<attribute name="colalign" label="瀵归綈鏂瑰紡" type="String"
+					length="400" />
+				<attribute name="coleditsourcetype" label="鏄剧ず鏉ユ簮绫诲瀷" type="String"
+					length="400" />
+				<attribute name="coleditsource" label="鏄剧ず鏉ユ簮" type="String"
+					length="400" />
+				<attribute name="colhtmlstyle" label="HTML鏄剧ず鏍煎紡" type="String"
+					length="400" />
+				<attribute name="collimit" label="闀垮害闄愬埗" type="String"
+					length="400" />
+				<attribute name="colvisible" label="鏄惁鍙" type="String"
+					length="400" />
+				<attribute name="colreadonly" label="鏄惁鍙" type="String"
+					length="400" />
+				<attribute name="colrequired" label="鏄惁蹇呴』" type="String"
+					length="400" />
+				<attribute name="colsortable" label="鏄惁鎺掑簭" type="String"
+					length="400" />
+				<attribute name="isfilter" label="鏄惁鏌ヨ" type="String"
+					length="400" />
+				<attribute name="colspan" label="璺ㄥ嚑鏍�" type="String"
+					length="400" />
+				<attribute name="isautocomplete" label="鑷姩杈撳叆鎻愮ず" type="String"
+					length="400" />
+				<attribute name="groupid" label="缁勭紪鍙�" type="String"
+					length="400" />
+				<attribute name="colfilterrefid" label="瀹為檯鐨勫叧鑱斿瓧娈�" type="String"
+					length="400" />
+				<attribute name="inputuser" label="鐧昏浜�" type="String"
+					length="400" />
+				<attribute name="inputtime" label="鐧昏鏃堕棿" type="String"
+					length="400" />
+				<attribute name="updateuser" label="鏇存柊浜�" type="String"
+					length="400" />
+				<attribute name="updatetime" label="鏇存柊鏃堕棿" type="String"
+					length="400" />
+				<attribute name="isaudit" label="" type="String" length="400" />
+				<attribute name="colfilterattrs" label="鍏宠仈鍐呭閫夋嫨" type="String"
+					length="400" />
+				<attribute name="isupdate" label="鏄惁鏇存柊" type="String"
+					length="400" />
+				<attribute name="parentcolindex" label="鐖跺簭鍙�" type="String"
+					length="400" />
+				<attribute name="tips" label="鎻愮ず" type="String" length="400" />
+				<attribute name="colinnerbtevent" label="鍐呯疆鎸夐挳浜嬩欢" type="String"
+					length="400" />
+				<attribute name="colfilteroptions" label="杩囨护璁剧疆" type="String"
+					length="400" />
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="awe_do_library" />
+				</managerProperties>
+			</manager>
+		</class>
+
+		<class name="APP_PUSH_CONFIG" label="app鎺ㄩ€侀厤缃ā鏉�" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="缂栧彿" type="STRING" length="100" />
+				<attribute name="IS_PUSH" label="鏄惁寮€鍚帹閫佸姛鑳�" type="STRING"
+					length="100" />
+				<attribute name="APP_SECRET_KEY_ANDROID" label="瀹夊崜鎵嬫満鎺ㄩ€佺閽�"
+					type="STRING" length="4000" />
+				<attribute name="APP_SECRET_KEY_IOS" label="IOS鎵嬫満鎺ㄩ€佺閽�"
+					type="STRING" length="4000" />
+				<attribute name="MY_PACKAGE_NAME" label="瀹夊崜搴旂敤绋嬪簭鍖呭悕" type="STRING"
+					length="4000" />
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="APP_PUSH_CONFIG" />
+				</managerProperties>
+			</manager>
+		</class>
+
+		<class name="APP_PUSH_MESSAGE" label="app鎺ㄩ€佹ā鏉�" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="缂栧彿" type="STRING" length="100" />
+				<attribute name="USERID" label="鐢ㄦ埛缂栧彿" type="STRING"
+					length="100" />
+				<attribute name="title" label="娑堟伅鏍囬" type="STRING" length="4000" />
+				<attribute name="MESSAGE_CONTENT" label="淇℃伅鍐呭" type="STRING"
+					length="4000" />
+				<attribute name="PUSH_TYPE" label="鎺ㄩ€佺姸鎬�" type="STRING"
+					length="1" />
+				<attribute name="PUSH_RESULT" label="鎺ㄩ€佺粨鏋�" type="STRING"
+					length="4000" />
+				<attribute name="PUSH_TS" label="鎺ㄩ€佹椂闂�" type="STRING"
+					length="100" />
+				<attribute name="RECORD_TS" label="璁板綍鏃堕棿" type="STRING"
+					length="100" />
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="APP_PUSH_MESSAGE" />
+				</managerProperties>
+			</manager>
+		</class>
+
+		<class name="APP_VERSION" label="APP鐗堟湰" keyAttributes="id">
+			<attributes>
+				<attribute name="id" label="缂栧彿" type="STRING" length="32" />
+				<attribute name="VERSION_DESC" label="鐗堟湰鎻忚堪" type="STRING"
+					length="255" />
+				<attribute name="UP_DATE" label="涓婁紶鏃堕棿" type="STRING"
+					length="20" />
+				<attribute name="IMAGE_PATH" label="涓嬭浇璺緞" type="STRING"
+					length="512" />
+				<attribute name="IS_NEW" label="鏄惁鏂扮増鏈�" type="STRING"
+					length="10" />
+				<attribute name="PHONE_TYPE" label="鎵嬫満绫诲瀷" type="STRING"
+					length="10" />
+				<attribute name="CREATE_DATE" label="鍒涢€犳棩鏈�" type="STRING"
+					length="20" />
+				<attribute name="MODIFY_DATE" label="淇敼鏃ユ湡" type="STRING"
+					length="20" />
+				<attribute name="BASE_FILE_ID" label="鍩烘湰鏂囦欢id" type="STRING"
+					length="32" />
+				<attribute name="CREATOR" label="鍒涢€犺€�" type="STRING"
+					length="32" />
+				<attribute name="MODIFICATOR" label="淇敼鑰�" type="STRING"
+					length="32" />
+				<attribute name="VERSION_CODE" label="鐗堟湰鍙�" type="STRING"
+					length="255" />
+				<attribute name="VERSION_NAME" label="鐗堟湰鍚�" type="STRING"
+					length="255" />
+				<attribute name="MUST_UPDATE" label="鏄惁寮哄埗鏇存柊" type="STRING"
+					length="10" />
+				<attribute name="FILE_NAME" label="鏂囦欢鍚�" type="STRING"
+					length="512" />
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="createKey" value="true" />
+					<property name="table" value="APP_VERSION" />
+				</managerProperties>
+			</manager>
+		</class>
+		<!-- <class name="APP_BUSINESS_GROUP" label="App涓氬姟璇︽儏鍒嗙粍閰嶇疆" keyAttributes="GROUP_CODE"> 
+			<attributes> <attribute name="GROUP_CODE" lable="鍒嗙粍鎻忚堪" type="STRING" length="300" 
+			/> <attribute name="GROUP_NAME" lable="鍒嗙粍鍚嶇О" type="STRING" length="300" /> 
+			<attribute name="FLOWNO" lable="娴佺▼鍙�" type="STRING" length="2000" /> <attribute 
+			name="PHASENO" lable="鑺傜偣鍙�" type="STRING" length="2000" /> <attribute name="ISLIST" 
+			lable="鏄惁鏄剧ず鍒楄〃" type="STRING" length="18" /> <attribute name="GROUP_POSITION" 
+			lable="鍒嗙粍浣嶇疆" type="int" length="20" /> </attributes> <manager> <managerProperties> 
+			<property name="createKey" value="true" /> <property name="table" value="APP_BUSINESS_GROUP" 
+			/> </managerProperties> </manager> </class> <class name="APP_BUSINESS_TEMPLATE" 
+			label="App涓氬姟璇︽儏鏁版嵁閰嶇疆" keyAttributes="DATA_CODE"> <attributes> <attribute name="GROUP_CODE" 
+			lable="鍒嗙粍鍙�" type="STRING" length="900" /> <attribute name="DONO" lable="library 
+			缁戝畾鐢�-妯℃澘鍙�" type="STRING" length="96" /> <attribute name="COLINDEX" lable="library 
+			缁戝畾鐢�-瀛楁鍙�" type="STRING" length="54" /> <attribute name="SORTNO" lable="library 
+			缁戝畾鐢�-瀛楁鍙�" type="STRING" length="54" /> <attribute name="COLNAME" lable="library 
+			缁戝畾鐢�-浣跨敤鍚嶇О" type="STRING" length="80" /> <attribute name="DATA_NAME" lable="鏁版嵁鍚嶇О" 
+			type="STRING" length="900" /> <attribute name="DATA_CODE" lable="鏁版嵁鍩熷悕" type="STRING" 
+			length="900" /> <attribute name="ISLIST" lable="鍒楄〃椤甸潰鏄剧ず" type="STRING" length="54" 
+			/> <attribute name="ISSHOW" lable="璇︽儏椤甸潰鏄剧ず" type="STRING" length="54" /> <attribute 
+			name="DATA_POSITION" lable="鏁版嵁浣嶇疆" type="int" length="20" /> <attribute name="ISCONVERT" 
+			lable="鏄惁杞崲" type="STRING" length="54" /> </attributes> <manager> <managerProperties> 
+			<property name="createKey" value="true" /> <property name="table" value="APP_BUSINESS_TEMPLATE" 
+			/> </managerProperties> </manager> </class> -->
+		<class name="APP_BUSINESS_GROUP" label="App涓氬姟璇︽儏鍒嗙粍閰嶇疆"
+			keyAttributes="GROUP_CODE">
+			<attributes>
+				<attribute name="GROUP_CODE" lable="鍒嗙粍鎻忚堪" type="STRING"
+					length="300" />
+				<attribute name="GROUP_NAME" lable="鍒嗙粍鍚嶇О" type="STRING"
+					length="300" />
+				<attribute name="ISLIST" lable="鏄惁鏄剧ず鍒楄〃" type="STRING"
+					length="18" />
+				<attribute name="GROUP_POSITION" lable="鍒嗙粍浣嶇疆" type="int"
+					length="20" />
+				<attribute name="GROUP_ENABLE" lable="鏄惁寮€鍚垎缁�" type="STRING"
+					length="1" />
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="createKey" value="true" />
+					<property name="table" value="APP_BUSINESS_GROUP" />
+				</managerProperties>
+			</manager>
+		</class>
+
+		<class name="APP_BUSINESS_TEMPLATE" label="App涓氬姟璇︽儏鏁版嵁閰嶇疆"
+			keyAttributes="GROUP_CODE,DATA_CODE">
+			<attributes>
+				<attribute name="GROUP_CODE" lable="鍒嗙粍鍙�" type="STRING"
+					length="900" />
+				<attribute name="DONO" lable="library 缁戝畾鐢�-妯℃澘鍙�" type="STRING"
+					length="96" />
+				<attribute name="COLINDEX" lable="library 缁戝畾鐢�-瀛楁鍙�" type="STRING"
+					length="54" />
+				<attribute name="SORTNO" lable="library 缁戝畾鐢�-瀛楁鍙�" type="STRING"
+					length="54" />
+				<attribute name="COLNAME" lable="library 缁戝畾鐢�-浣跨敤鍚嶇О" type="STRING"
+					length="80" />
+				<attribute name="DATA_NAME" lable="鏁版嵁鍚嶇О" type="STRING"
+					length="900" />
+				<attribute name="DATA_CODE" lable="鏁版嵁鍩熷悕" type="STRING"
+					length="900" />
+				<attribute name="ISLIST" lable="鍒楄〃椤甸潰鏄剧ず" type="STRING"
+					length="54" />
+				<attribute name="ISSHOW" lable="璇︽儏椤甸潰鏄剧ず" type="STRING"
+					length="54" />
+				<attribute name="DATA_POSITION" lable="鏁版嵁浣嶇疆" type="int"
+					length="20" />
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="createKey" value="true" />
+					<property name="table" value="APP_BUSINESS_TEMPLATE" />
+				</managerProperties>
+			</manager>
+		</class>
+
+		<!-- app娴佺▼椤电閰嶇疆 -->
+		<class name="PRD_NODEINFO_CATALOG_APP" label="app娴佺▼椤电閰嶇疆"
+			keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" lable="涓婚敭ID" type="STRING" length="100" />
+				<attribute name="FLOWNO" lable="娴佺▼缂栧彿" type="STRING"
+					length="100" />
+				<attribute name="PHASENO" lable="鑺傜偣缂栧彿" type="STRING"
+					length="100" />
+				<attribute name="CONFIG_TYPE" lable="閰嶇疆绫诲瀷" type="STRING"
+					length="100" />
+				<attribute name="CONFIG_DISPLAY" lable="閰嶇疆鏄剧ず" type="STRING"
+					length="100" />
+				<attribute name="ENABLE_OPERATION" lable="鏄惁鍙搷浣�" type="STRING"
+					length="1" />
+				<attribute name="SORTNO" lable="鎺掑簭鍙�" type="int" length="19" />
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="createKey" value="true" />
+					<property name="table" value="PRD_NODEINFO_CATALOG_APP" />
+				</managerProperties>
+			</manager>
+		</class>
+
+		<class name="PRD_NODEINFO_LIBRARY_APP" label="app娴佺▼椤电搴撻厤缃�"
+			keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" lable="缂栧彿" type="STRING" length="100" />
+				<attribute name="APP_BUSINESS_GROUP_CODE" lable="App涓氬姟璇︽儏鍒嗙粍閰嶇疆COD"
+					type="STRING" length="100" />
+				<attribute name="INITIAL_CONDITION" lable="鍒濆鍙傛暟" type="STRING"
+					length="3000" />
+				<attribute name="AUXILIARY_CONDITION" lable="闄勫姞鍙傛暟" type="STRING"
+					length="3000" />
+				<attribute name="INTERFACE_DESC" lable="鎺ュ彛鎻忚堪" type="STRING"
+					length="3000" />
+				<attribute name="ATTRIBUTE1" lable="杩藉姞鍙傛暟1" type="STRING"
+					length="3000" />
+				<attribute name="ATTRIBUTE2" lable="杩藉姞鍙傛暟2" type="STRING"
+					length="3000" />
+				<attribute name="ATTRIBUTE3" lable="杩藉姞鍙傛暟3" type="STRING"
+					length="3000" />
+				<attribute name="ATTRIBUTE4" lable="杩藉姞鍙傛暟4" type="STRING"
+					length="3000" />
+				<attribute name="ATTRIBUTE5" lable="杩藉姞鍙傛暟5" type="STRING"
+					length="3000" />
+				<attribute name="ATTRIBUTE6" lable="杩藉姞鍙傛暟6" type="STRING"
+					length="3000" />
+				<attribute name="ATTRIBUTE7" lable="杩藉姞鍙傛暟7" type="STRING"
+					length="3000" />
+				<attribute name="ATTRIBUTE8" lable="杩藉姞鍙傛暟8" type="STRING"
+					length="3000" />
+				<attribute name="ATTRIBUTE9" lable="杩藉姞鍙傛暟9" type="STRING"
+					length="3000" />
+				<attribute name="REBUILD_JBO_CLASS" lable="杩藉姞鍙傛暟9" type="STRING"
+					length="3000" />
+				<attribute name="FATHER_ID" lable="鐖禝D" type="STRING"
+					length="3000" />
+				<attribute name="DISPLAY_MANAGE_CLASS" lable="鏌ヨ妯℃澘鎺у埗绫�"
+					type="STRING" length="3000" />
+				<attribute name="SAVE_MANAGE_CLASS" lable="淇濆瓨妯℃澘鎺у埗绫�" type="STRING"
+					length="3000" />
+				<attribute name="DELETE_MANAGE_CLASS" lable="鍒犻櫎妯℃澘鎺у埗绫�"
+					type="STRING" length="3000" />
+				<attribute name="ENABLE_CONDITION" lable="鍚敤鏉′欢寮€鍚�" type="STRING"
+					length="1" />
+				<attribute name="OPEN_CONDITION" lable="寮€鍚潯浠�" type="STRING"
+					length="3000" />
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="createKey" value="true" />
+					<property name="table" value="PRD_NODEINFO_LIBRARY_APP" />
+				</managerProperties>
+			</manager>
+		</class>
+
+		<class name="PRD_NODEINFO_MIDDLE_APP" label="app娴佺▼椤电搴撻厤缃腑闂磋〃"
+			keyAttributes="APP_NODE_LIBRARY_ID,APP_NODE_CATALOG_ID">
+			<attributes>
+				<attribute name="APP_NODE_LIBRARY_ID" lable="app娴佺▼椤电鎺ュ彛搴撻厤缃甀D"
+					type="STRING" length="100" />
+				<attribute name="APP_NODE_CATALOG_ID" lable="app娴佺▼椤电閰嶇疆ID"
+					type="STRING" length="100" />
+				<attribute name="APP_DISPLAY" lable="閰嶇疆鏄剧ず" type="STRING"
+					length="100" />
+				<attribute name="ENABLE_QUERY" lable="鍙煡璇㈡搷浣�" type="STRING"
+					length="1" />
+				<attribute name="ENABLE_SAVE" lable="鍙繚鎸佹搷浣�" type="STRING"
+					length="1" />
+				<attribute name="ENABLE_DELETE" lable="鍙垹闄ゆ搷浣�" type="STRING"
+					length="1" />
+				<attribute name="SORTNO" lable="鎺掑簭鍙�" type="int" length="19" />
+				<attribute name="ISINUSE" lable="鏄惁鏈夋晥" type="STRING"
+					length="1" />
+				<attribute name="ENABLE_DOWNLOAD" lable="鍙笅杞芥搷浣�" type="STRING"
+					length="1" />
+				<attribute name="DOWNLOAD_PARAM" lable="涓嬭浇鍙傛暟" type="STRING"
+					length="1000" />
+
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="createKey" value="false" />
+					<property name="table" value="PRD_NODEINFO_MIDDLE_APP" />
+				</managerProperties>
+			</manager>
+		</class>
+		<!-- app娴佺▼椤电閰嶇疆 -->
+	</package>
+
+</jbo>
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 2e4229f4e..232de0eb5 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -1,475 +1,445 @@
 <?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</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>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閰嶇疆 -->
-	<!--- ================================== -->
-	<servlet>
-		<description>閽堝ObjectWindow鐨勭晫闈㈡弿杩拌瑷€</description>
-		<display-name>XWRenderServlet</display-name>
-		<servlet-name>XWRenderServlet</servlet-name>
-		<servlet-class>cn.coyoteam.aweresf.web.servlet.XWRenderServlet</servlet-class>
+<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>XWInterceptConfig</param-name>
-			<param-value>classpath:/com/amarsoft/aims/xwrender-intercept.properties</param-value>
+			<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</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-mapping>
-		<servlet-name>XWRenderServlet</servlet-name>
-		<url-pattern>/xwrender/*</url-pattern>
-	</servlet-mapping>
 	<servlet>
-		<description>閽堝澶栭儴鎻愪緵鎺ュ彛鐨剋ebapi</description>
-		<display-name>XWTransformServlet</display-name>
-		<servlet-name>XWTransformServlet</servlet-name>
-		<servlet-class>cn.coyoteam.aweresf.web.servlet.XWTransformServlet</servlet-class>
+		<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>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>XWTransformServlet</servlet-name>
-		<url-pattern>/webapi/xw/*</url-pattern>
+		<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.coyoteam.aweresf.web.servlet.RestfullServiceServlet</servlet-class> -->
+		<servlet-class>cn.servlet.RestfullServiceServlet</servlet-class>
+
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet-mapping>
@@ -480,44 +450,58 @@
 		<description>restfull鑷姩鎵弿璺緞璁剧疆</description>
 		<param-name>RestfullScanPackage</param-name>
 		<param-value>
-        cn.coyoteam.aweresf.web.restfull.impl,
-        apx.com.amarsoft.apx.web.resf,
-        apx.com.amarsoft.aims.flow.bzsrv,
-        apx.com.amarsoft.als.chksce.bzsrv,
-        apx.com.amarsoft.aims.planteam.bzsrv,
-        apx.com.amarsoft.apx.web.als.user.resf,
-        apx.com.amarsoft.als.temp.bzsrv,
-        apx.com.amarsoft.als.customer.bzsrv,
-        apx.com.amarsoft.als.work.flow.bzsrv,
-        apx.com.amarsoft.als.user.center.bzsrv,
-        apx.com.amarsoft.als.user.logon.bzsrv
+	        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.query,
+				
+				<!-- 鎰忚 -->	
+					<!-- 绛剧讲鎰忚 -->
+					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,
     </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.coyoteam.aweresf.web.filter.SessionAndContextFilter</filter-class> -->
+		<filter-class>cn.filter.SessionAndContextFilter</filter-class>
 		<init-param>
 			<param-name>NoCheckURI</param-name>
 			<param-value>
-            /api-doc-index,
-            /resf/LoginProc/Login,
-            /resf/LoginProc/Logout,
-            /resf/logon/manager/logon,
-            /resf/logon/manager/logout,
-            /resf/user/center/manager/detection/version,
-            /resf/user/center/manager/close/gesture,
-            /resf/user/center/manager/acquisition/gesture,
-            /resf/flow/work/manager/attachments/down/att,
-            /resf/flow/work/manager/attachments/down/att/6,
-            
-            /resf/flow/files/down/docById,
-            /resf/files/downloadApp,
-            /resf/files/downloadPlist,
-            /resf/files/down/flow/image,
-            /resf/files/show/image,
-            /resf/files/downloadAppById,
+             	<!-- 鐢ㄦ埛 鐧诲綍/娉ㄩ攢 -->
+					/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>
diff --git a/WebContent/WEB-INF/web_app.xml b/WebContent/WEB-INF/web_app.xml
new file mode 100644
index 000000000..1e851bb4b
--- /dev/null
+++ b/WebContent/WEB-INF/web_app.xml
@@ -0,0 +1,533 @@
+<?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</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>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,
+				<!-- 鎴戠殑宸ヤ綔 -->
+					<!-- 浠ｅ姙鍒楄〃 -->
+					apx.com.amarsoft.als.business.work.to.controller,
+					<!-- 宸插姙鍒楄〃 -->
+					apx.com.amarsoft.als.business.work.has.controller,
+					<!-- 浼犻槄浜嬪疁 -->
+					apx.com.amarsoft.als.business.work.circulate.pass.controller,
+					<!-- 宸茬粨鏉熶紶闃� -->
+					apx.com.amarsoft.als.business.work.circulate.close.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,
+    </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/WebContent/appDownload.jsp b/WebContent/appDownload.jsp
index b87512534..90e234215 100644
--- a/WebContent/appDownload.jsp
+++ b/WebContent/appDownload.jsp
@@ -1,81 +1,84 @@
-<%@ page contentType="text/html; charset=GBK"  pageEncoding="GBK"%>
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="gb2312" />
-<meta name="viewport" content="initial-scale=1,maximum-scale=1,user-scalable=no,width=device-width,height=device-height">
-<meta name="format-detection" content="telephone=no" />
-<meta http-equiv="Cache-Control" content="no-transform" />
-<title>App应用下载</title>
-<meta name="keywords" content="" />
-<meta name="description" content="" />
-<script type="text/javascript" src="${pageContext.request.contextPath}/js/jquery/jquery-1.11.0.min.js"></script>
-<style type="text/css">
-#weixin-tip{display:none;position:fixed;left:0;top:0;background:rgba(0,0,0,0.8);filter:alpha(opacity=80);width:100%;height:100%;z-index:100;}
-#weixin-tip p{text-align:center;margin-top:10%;padding:0 5%;position:relative;}
-#weixin-tip .close{color:#fff;padding:5px;font:bold 20px/24px simsun;text-shadow:0 1px 0 #ddd;position:absolute;top:0;left:5%;}
-.butonpanle{width: 100%;margin-top:10%; height: 20%}
-.android-btn{width:80%;height: 30%;padding-top: 2%;padding-bottom: 3%;border:0.5;background-color: #8DB6CD;color:white;fount-size:16;display: block;margin: 0 auto;}
-img{display: block;margin: 0 auto;}
-#tips{margin: 0 auto;width: 100%;color:red; white-space: pre-wrap; text-align: center;}
-</style>
-</head>
-<%
-  String devType="android"; 
-	String userAgent =  request.getHeader("user-agent");
-	if(userAgent.toLowerCase().indexOf("iphone")>=0){
-		devType="ios";
-	}
-%>
-<body style="background-color: #F4F4F4;width: 100%">
-    <div id="img-content">
-    <img src="${pageContext.request.contextPath}/AppMain/AppLogo/logo.png"/>
-    <div class="butonpanle">
-    <button id="J_weixin" class="android-btn">
-    	<labe>下载安装</label>
-    </button>
-    </div>
-    <br/>
-    <label id="tips"></label>
-    </div>
-    <div id="weixin-tip">
-    <p><img src="${pageContext.request.contextPath}/AppMain/AppLogo/down_wx_t.png" alt="微信扫描打开APP下载链接提示代码优化" alt="微信打开"/>
-    </div>
-</body>
-</html>
-<script type="text/javascript">
-    var is_weixin = (function(){
-        return navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1
-        }
-    )();
-    window.onload = function() {
-        var winHeight = typeof window.innerHeight != 'undefined' ? window.innerHeight : document.documentElement.clientHeight; //兼容IOS，不需要的可以去掉
-        var btn = document.getElementById('J_weixin');
-        var Testbtn = document.getElementById('J_Test');
-        var tip = document.getElementById('weixin-tip');
-        var close = document.getElementById('close');
-        var show = function(){
-            tip.style.height = winHeight + 'px'; //兼容IOS弹窗整屏
-            tip.style.display = 'block';
-            return false;
-        };
-        tip.onclick = function() {
-            tip.style.display = 'none';
-        };
-        btn.onclick = function(e) {
-            if(is_weixin){
-                show();
-            }else{
-            	<%if("android".equalsIgnoreCase(devType)){%>
-            	location.href="/maotai/webapi/resf/files/downloadApp?devType=<%=devType%>";
-                <%}else{%>
-                location.href="itms-services:///?action=download-manifest&url=http://139.196.252.5:9090/maotai/webapi/resf/files/downloadPlist";
-                <%}%>
-                setTimeout(function(){
-                    $("#tips").html("");
-                },1000)
-            }
-        };
-    }
-
+<%@ page contentType="text/html; charset=utf-8"  pageEncoding="utf-8"%>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="gb2312" />
+<meta name="viewport" content="initial-scale=1,maximum-scale=1,user-scalable=no,width=device-width,height=device-height">
+<meta name="format-detection" content="telephone=no" />
+<meta http-equiv="Cache-Control" content="no-transform" />
+<title>App搴旂敤涓嬭浇</title>
+<meta name="keywords" content="" />
+<meta name="description" content="" />
+<script type="text/javascript" src="${pageContext.request.contextPath}/js/jquery/jquery-1.11.0.min.js"></script>
+<style type="text/css">
+#weixin-tip{display:none;position:fixed;left:0;top:0;background:rgba(0,0,0,0.8);filter:alpha(opacity=80);width:100%;height:100%;z-index:100;}
+#weixin-tip p{text-align:center;margin-top:10%;padding:0 5%;position:relative;}
+#weixin-tip .close{color:#fff;padding:5px;font:bold 20px/24px simsun;text-shadow:0 1px 0 #ddd;position:absolute;top:0;left:5%;}
+.butonpanle{width: 100%;margin-top:10%; height: 20%}
+.android-btn{width:80%;height: 30%;padding-top: 2%;padding-bottom: 3%;border:0.5;background-color: #8DB6CD;color:white;fount-size:16;display: block;margin: 0 auto;}
+img{display: block;margin: 0 auto;}
+#tips{margin: 0 auto;width: 100%;color:red; white-space: pre-wrap; text-align: center;}
+</style>
+</head>
+<%
+  String devType="android"; 
+	String userAgent =  request.getHeader("user-agent");
+	if(userAgent.toLowerCase().indexOf("iphone")>=0){
+		devType="ios";
+	}
+%>
+<body style="background-color: #F4F4F4;width: 100%">
+    <div id="img-content">
+    <br/>
+    <br/>
+    <br/>
+    <img src="${pageContext.request.contextPath}/AppMain/Logon/appDownloadLogo.png"/>
+    <div class="butonpanle">
+    <button id="J_weixin" class="android-btn">
+    	<labe>涓嬭浇瀹夎</label>
+    </button>
+    </div>
+    <br/>
+    <label id="tips"></label>
+    </div>
+    <div id="weixin-tip">
+    <p><img src="${pageContext.request.contextPath}/AppMain/AppLogo/down_wx_t.png" alt="寰俊鎵弿鎵撳紑APP涓嬭浇閾炬帴鎻愮ず浠ｇ爜浼樺寲" alt="寰俊鎵撳紑"/>
+    </div>
+</body>
+</html>
+<script type="text/javascript">
+    var is_weixin = (function(){
+        return navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1
+        }
+    )();
+    window.onload = function() {
+        var winHeight = typeof window.innerHeight != 'undefined' ? window.innerHeight : document.documentElement.clientHeight; //鍏煎IOS锛屼笉闇€瑕佺殑鍙互鍘绘帀
+        var btn = document.getElementById('J_weixin');
+        var Testbtn = document.getElementById('J_Test');
+        var tip = document.getElementById('weixin-tip');
+        var close = document.getElementById('close');
+        var show = function(){
+            tip.style.height = winHeight + 'px'; //鍏煎IOS寮圭獥鏁村睆
+            tip.style.display = 'block';
+            return false;
+        };
+        tip.onclick = function() {
+            tip.style.display = 'none';
+        };
+        btn.onclick = function(e) {
+            if(is_weixin){
+                show();
+            }else{
+            	<%if("android".equalsIgnoreCase(devType)){%>
+            	location.href="${pageContext.request.contextPath}/webapi/resf/files/downloadApp?devType=<%=devType%>";
+                <%}else{%>
+                /* location.href="itms-services:///?action=download-manifest&url=http://139.196.252.5:9090/maotai/webapi/resf/files/downloadPlist"; */
+                <%}%>
+                setTimeout(function(){
+                    $("#tips").html("");
+                },1000)
+            }
+        };
+    }
+
 </script>
\ No newline at end of file
diff --git a/WebContent/logon.html b/WebContent/logon.html
index 7275048a6..78102aad5 100644
--- a/WebContent/logon.html
+++ b/WebContent/logon.html
@@ -38,7 +38,7 @@
 		</select>
 		</div>
 		<div class="logon_user">用户名ID：<input type="text" name="UserID" onkeypress="javascript:pressEnter(1, event);" value="test11" onblur="javascript:myTrim();" class="input_class"/></div>
-		<div class="logon_user">密码：<input type="password" name="Password" value="000000als" onkeypress="javascript:pressEnter(2, event);"  class="input_class"/></div>
+		<div class="logon_user">密码：<input type="text" name="Password" value="000000als" onkeypress="javascript:pressEnter(2, event);"  class="input_class"/></div>
 		<!-- <div class="logon_user" style="position: relative;">验证码：<input type="text" name="CheckCode" onKeyPress="javascript:pressEnter(3, event);" class="input_class" style="margin-right: 70px; width: 110px;"/><img style="position: absolute; right: 0; bottom: 0; cursor: pointer;" src="servlet/checkcode" onclick="history.go(0)" title="点击刷新验证码"/></div> -->
 	 	<span id='amarhidden' style='display:none'>正在检查用户请稍等.....</span>
 		<div class="logon_button">
