git-svn-id: https://192.168.57.71/svn/lyggkj@157 1a6f6e3a-4066-fe46-b609-79c204482ece

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zysqbp/ZysqbpController.java

@@ -778,7 +778,7 @@ public class ZysqbpController extends BaseController {
 				}
 			}
 		}
-		download(parameters, "危险货物港口作业申请书", report, type,
+		download(parameters, "港口危险货物作业申请书", report, type,
 				new JRBeanCollectionDataSource(dataList), response, request);
 	}
 

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/zysqbp/XksbEntity.java

@@ -4,7 +4,7 @@ import java.util.Date;
 
 
 /**
- * 危险货物港口作业申报许可
+ * 港口危险货物作业申报许可
  */
 public class XksbEntity{
 

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/zysqbp/ZysqbpBgEntity.java

@@ -17,7 +17,7 @@ import com.jtgh.yjpt.entity.BaseEntity;
 
 
 /**
- * 应急平台危险货物港口作业申报单  变更子表
+ * 应急平台港口危险货物作业申报单  变更子表
  * 
  */
 @Entity

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/zysqbp/ZysqbpEntity.java

@@ -27,7 +27,7 @@ import com.jtgh.yjpt.entity.jyr.JyrEntity;
 import com.jtgh.yjpt.entity.zyfzndjy.GkwxhwzyfzblFzEntity;
 
 /**
- * 应急平台危险货物港口作业申报单
+ * 应急平台港口危险货物作业申报单
  * 
  * @author shixm
  */

gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq.jrxml

@@ -50,7 +50,7 @@
 				<textElement textAlignment="Center">
 					<font fontName="宋体" size="30" isBold="true"/>
 				</textElement>
-				<text><![CDATA[危险货物港口作业附证申请表]]></text>
+				<text><![CDATA[港口危险货物作业附证申请表]]></text>
 			</staticText>
 			<textField>
 				<reportElement x="43" y="0" width="169" height="20" uuid="8f352d5e-71f9-4769-a3a4-9120694a70ba"/>

gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport2-html.jrxml

@@ -90,7 +90,7 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="14" isBold="true"/>
 					</textElement>
-					<text><![CDATA[危险货物港口作业申请]]></text>
+					<text><![CDATA[港口危险货物作业申请]]></text>
 				</staticText>
 				<staticText>
 					<reportElement x="0" y="102" width="117" height="30" uuid="8a9d62d9-9374-44fa-bc71-b02303b48b24"/>

gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport2.jrxml

@@ -89,7 +89,7 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="14" isBold="true"/>
 					</textElement>
-					<text><![CDATA[危险货物港口作业申请]]></text>
+					<text><![CDATA[港口危险货物作业申请]]></text>
 				</staticText>
 				<staticText>
 					<reportElement x="0" y="102" width="117" height="30" uuid="8a9d62d9-9374-44fa-bc71-b02303b48b24"/>

gkaq/yjpt-java/trunk/resources/iReport/aqsp/zysq-html.jrxml

@@ -471,7 +471,7 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="20" isBold="true" pdfEncoding="Cp1252" isPdfEmbedded="true"/>
 				</textElement>
-				<text><![CDATA[危险货物港口作业申请书]]></text>
+				<text><![CDATA[港口危险货物作业申请书]]></text>
 			</staticText>
 			<staticText>
 				<reportElement stretchType="RelativeToTallestObject" x="0" y="33" width="70" height="23" uuid="4c6339ab-97eb-4106-b68e-80e2b5e244ca"/>

gkaq/yjpt-java/trunk/resources/iReport/aqsp/zysq.jrxml

@@ -468,7 +468,7 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="20" isBold="true" pdfEncoding="Cp1252" isPdfEmbedded="true"/>
 				</textElement>
-				<text><![CDATA[危险货物港口作业申请书]]></text>
+				<text><![CDATA[港口危险货物作业申请书]]></text>
 			</staticText>
 			<staticText>
 				<reportElement x="0" y="33" width="53" height="23" uuid="4c6339ab-97eb-4106-b68e-80e2b5e244ca"/>

gkaq/yjpt-java/trunk/resources/spring/applicationContext-workflow.xml

@@ -8,6 +8,7 @@
 	http://www.springframework.org/schema/context/spring-context-3.0.xsd
 	http://www.springframework.org/schema/aop
 	http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
+	
 	<bean id="processEngineConfiguration" class="org.activiti.spring.SpringProcessEngineConfiguration">
 		<property name="dataSource" ref="dataSource" />
 		<property name="transactionManager" ref="transactionManager" />
@@ -34,7 +35,6 @@
 					<value>classpath*:/deployments/zdsgyhpc-city.*</value>
 					<value>classpath*:/deployments/zysbsp-city.*</value>
 				-->
-
 			</list>
 		</property>
 		<property name="customSessionFactories">
@@ -63,7 +63,6 @@
 	<bean id="managementService" factory-bean="processEngine"
 		  factory-method="getManagementService" />
 
-	<bean id="configService"	class="com.jtgh.yjpt.service.impl.auth.ConfigServiceImpl"
-		  scope="singleton">  
+	<bean id="configService" class="com.jtgh.yjpt.service.impl.auth.ConfigServiceImpl" scope="singleton">  
 	</bean>
 </beans>

gkaq/yjpt-java/trunk/yjpt/WEB-INF/web.xml

@@ -3,7 +3,9 @@
 	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
 	id="WebApp_ID" version="3.0">
+	
 	<display-name>yjpt</display-name>
+	
 	<context-param>
 		<description>系统版本</description>
 		<param-name>version</param-name>
@@ -39,12 +41,20 @@
 		<param-name>JyrDisbleEdit</param-name>
 		<param-value>Y</param-value>
 	</context-param>
+	
+	<!--
+		在web.xml中不写任何参数配置信息，默认的路径是”/WEB-INF/applicationContext.xml，
+		在WEB-INF目录下创建的xml文件的名称必须是applicationContext.xml。
+		如果是要自定义文件名可以在web.xml里加入contextConfigLocation这个context参数 
+	 -->
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>
 			classpath*:spring/applicationContext*.xml
 		</param-value>
 	</context-param>
+	
+	<!--  log4j -->
 	<context-param>
 		<param-name>log4jConfigLocation</param-name>
 		<param-value>/WEB-INF/log4j/log4j.xml</param-value>
@@ -57,15 +67,7 @@
 		<param-name>log4jRefreshInterval</param-name>
 		<param-value>3000</param-value>
 	</context-param>
-	<listener>
-		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-	</listener>
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-	<listener>
-		<listener-class>com.jtgh.yjpt.common.servlet.ContextListener</listener-class>
-	</listener>
+	
 	<context-param>
 		<param-name>resourceCacheTime</param-name>
 		<param-value>3600</param-value>
@@ -117,6 +119,18 @@
 		<param-value>3</param-value>
 	</context-param>
 	
+	<!--  log4j -->
+	<listener>
+		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
+	</listener>
+	<!-- ContextLoaderListener的作用就是启动Web容器时，自动装配ApplicationContext的配置信息 -->
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+	
+	<listener>
+		<listener-class>com.jtgh.yjpt.common.servlet.ContextListener</listener-class>
+	</listener>
 		
 	<filter>
 		<filter-name>encodingFilter</filter-name>
@@ -136,64 +150,65 @@
 	</filter-mapping>
 	
 	<!-- ======================== 单点登录开始 ======================== -->
-		<!-- 用于单点退出，该过滤器用于实现单点登出功能，可选配置-->
-		<listener>
-			<listener-class>org.jasig.cas.client.session.SingleSignOutHttpSessionListener</listener-class>
-		</listener>
+	<!-- 用于单点退出，该过滤器用于实现单点登出功能，可选配置-->
+	<listener>
+		<listener-class>org.jasig.cas.client.session.SingleSignOutHttpSessionListener</listener-class>
+	</listener>
 
-		<!-- 该过滤器用于实现单点登出功能，可选配置。 -->
-		<filter>
-			<filter-name>CAS Single Sign Out Filter</filter-name>
-			<filter-class>org.jasig.cas.client.session.SingleSignOutFilter</filter-class>
-		</filter>
-		<filter-mapping>
-			<filter-name>CAS Single Sign Out Filter</filter-name>
-			<url-pattern>/*</url-pattern>
-		</filter-mapping>
+	<!-- 该过滤器用于实现单点登出功能，可选配置。 -->
+	<filter>
+		<filter-name>CAS Single Sign Out Filter</filter-name>
+		<filter-class>org.jasig.cas.client.session.SingleSignOutFilter</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>CAS Single Sign Out Filter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
 
-		<filter>
-			<filter-name>CAS Filter</filter-name>
-			<filter-class>org.jasig.cas.client.authentication.AuthenticationFilter</filter-class>
-			<init-param>
-				<param-name>casServerLoginUrl</param-name>
-				<param-value>http://172.21.3.38:8080/znjg/</param-value>
-			</init-param>
-			<init-param>
-				<param-name>serverName</param-name>
-				<param-value>http://192.168.57.40:8080/</param-value>
-			</init-param>
-		</filter>		 
-	
-		<filter-mapping>
-			<filter-name>CAS Filter</filter-name>
-			<url-pattern>/sso/*</url-pattern>
-		</filter-mapping>
+	<filter>
+		<filter-name>CAS Filter</filter-name>
+		<filter-class>org.jasig.cas.client.authentication.AuthenticationFilter</filter-class>
+		<init-param>
+			<param-name>casServerLoginUrl</param-name>
+			<param-value>http://172.21.3.38:8080/znjg/</param-value>
+		</init-param>
+		<init-param>
+			<param-name>serverName</param-name>
+			<param-value>http://192.168.57.40:8080/</param-value>
+		</init-param>
+	</filter>		 
+
+	<filter-mapping>
+		<filter-name>CAS Filter</filter-name>
+		<url-pattern>/sso/*</url-pattern>
+	</filter-mapping>
 		
 		 
-		<!-- 该过滤器负责对Ticket的校验工作，必须启用它 -->
-		<filter>
-			<filter-name>CAS Validation Filter</filter-name>
-			<filter-class>org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter</filter-class>
-			<init-param>
-				<param-name>casServerUrlPrefix</param-name>
-				<param-value>http://172.21.3.38:8080/znjg/</param-value>
-			</init-param>
+	<!-- 该过滤器负责对Ticket的校验工作，必须启用它 -->
+	<filter>
+		<filter-name>CAS Validation Filter</filter-name>
+		<filter-class>org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter</filter-class>
+		<init-param>
+			<param-name>casServerUrlPrefix</param-name>
+			<param-value>http://172.21.3.38:8080/znjg/</param-value>
+		</init-param>
+		<init-param>
+			<param-name>serverName</param-name>
+			<param-value>http://192.168.57.40:8080/</param-value>
+		</init-param>
 			<init-param>
-				<param-name>serverName</param-name>
-				<param-value>http://192.168.57.40:8080/</param-value>
-			</init-param>
-				<init-param>
-					<param-name>encoding</param-name>
-					<param-value>UTF-8</param-value>
-			</init-param>
-		</filter>
-		<filter-mapping>
-			<filter-name>CAS Validation Filter</filter-name>
-			<url-pattern>/sso/*</url-pattern>
-		</filter-mapping>
-		
+				<param-name>encoding</param-name>
+				<param-value>UTF-8</param-value>
+		</init-param>
+	</filter>
+	<filter-mapping>
+		<filter-name>CAS Validation Filter</filter-name>
+		<url-pattern>/sso/*</url-pattern>
+	</filter-mapping> 
 	<!--======================== 单点登录结束 ======================== -->
-		<filter>
+	
+	
+	<filter>
 		<filter-name>LoginFilter</filter-name>
 		<filter-class>com.jtgh.yjpt.common.LoginFilter</filter-class>
 	</filter>
@@ -201,47 +216,52 @@
 		<filter-name>LoginFilter</filter-name>
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
+	
+	<filter>
+		<filter-name>openEntityManagerInViewFilter</filter-name>
+		<filter-class>org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>openEntityManagerInViewFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+
 	<servlet>
-		<servlet-name>springServlet</servlet-name>
+		<servlet-name>General Servlet</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 		<init-param>
 			<param-name>contextConfigLocation</param-name>
-			<param-value>/WEB-INF/config/spring-flex.xml</param-value>
+			<param-value>/WEB-INF/config/spring-mvc.xml</param-value>
 		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet>
-		<servlet-name>InitServlet</servlet-name>
-		<servlet-class>com.jtgh.yjpt.common.servlet.InitServlet</servlet-class>
-		<load-on-startup>99</load-on-startup>
+		<load-on-startup>0</load-on-startup>
 	</servlet>
-
 	<servlet-mapping>
-		<servlet-name>springServlet</servlet-name>
-		<url-pattern>/messagebroker/*</url-pattern>
+		<servlet-name>General Servlet</servlet-name>
+		<url-pattern>*.do</url-pattern>
 	</servlet-mapping>
+		
 	<servlet>
-		<servlet-name>General Servlet</servlet-name>
+		<servlet-name>springServlet</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 		<init-param>
 			<param-name>contextConfigLocation</param-name>
-			<param-value>/WEB-INF/config/spring-mvc.xml</param-value>
+			<param-value>/WEB-INF/config/spring-flex.xml</param-value>
 		</init-param>
-		<load-on-startup>0</load-on-startup>
+		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet-mapping>
-		<servlet-name>General Servlet</servlet-name>
-		<url-pattern>*.do</url-pattern>
+		<servlet-name>springServlet</servlet-name>
+		<url-pattern>/messagebroker/*</url-pattern>
 	</servlet-mapping>
-	<filter>
-		<filter-name>openEntityManagerInViewFilter</filter-name>
-		<filter-class>org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>openEntityManagerInViewFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
+
+	<servlet>
+		<servlet-name>InitServlet</servlet-name>
+		<servlet-class>com.jtgh.yjpt.common.servlet.InitServlet</servlet-class>
+		<load-on-startup>99</load-on-startup>
+	</servlet>
+
+	
 	<!-- Restlet adapter, used to expose modeler functionality through REST -->
 	<servlet>
 		<servlet-name>RestletServlet</servlet-name>

gkaq/yjpt-java/trunk/yjpt/iSignature/view/ZysqbpPrintSignature.jsp

@@ -773,7 +773,7 @@ try{
 							style="text-align: center; text-indent: 0px; vertical-align: middle;"
 							colspan="5"><span
 							style="color: rgb(0, 0, 0); line-height: 1.1406; font-family: 宋体; font-size: 20px; font-weight: bold;">
-								危险货物港口作业申请书 </span>
+								港口危险货物作业申请书 </span>
 						</td>
 						<td></td>
 					</tr>