git-svn-id: https://192.168.57.71/svn/jsgkj@849 931142cf-59ea-a443-aa0e-51397b428577

gkaq/yjpt-java/trunk/yjpt/WEB-INF/config/spring-flex.xml

@@ -21,12 +21,14 @@
 			</list>
 		</property>
 	</bean>
+	
 	<!-- 自动扫描且只扫描@Controller -->
+	<!-- spring-mvc.xml 已配置扫描controller
 	<context:component-scan base-package="com.jtgh.yjpt.controller"
 		use-default-filters="false">
 		<context:include-filter type="annotation"
 			expression="org.springframework.stereotype.Controller" />
 	</context:component-scan>
 	<mvc:annotation-driven />
-
+ 	-->
 </beans>

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

@@ -8,7 +8,7 @@
 		<description>系统版本</description>
 		<param-name>version</param-name>
 		<param-value>4.0.0</param-value>
-	</context-param>	
+	</context-param>
 	<context-param>
 		<description>0:省级;1:市级</description>
 		<param-name>deploy_mode</param-name>
@@ -34,12 +34,14 @@
 		<param-name>iSignature</param-name>
 		<param-value>N</param-value>
 	</context-param>
+	<!-- application 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>
@@ -85,7 +87,7 @@
 		<param-name>upload_image_size</param-name>
 		<param-value>500</param-value>
 	</context-param>
-	
+
 	<context-param>
 		<description>初始化菜单-经营人基本信息</description>
 		<param-name>init_menu</param-name>
@@ -111,8 +113,8 @@
 		<param-name>qlyg_result</param-name>
 		<param-value>3</param-value>
 	</context-param>
-	
-		
+
+
 	<filter>
 		<filter-name>encodingFilter</filter-name>
 		<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
@@ -129,66 +131,65 @@
 		<filter-name>encodingFilter</filter-name>
 		<url-pattern>/*</url-pattern>
 	</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>
-			<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>
-			<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>
-		
+	<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>
+		<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>
 	<!--======================== 单点登录结束 ======================== -->
-		<filter>
+
+	<filter>
 		<filter-name>LoginFilter</filter-name>
 		<filter-class>com.jtgh.yjpt.common.LoginFilter</filter-class>
 	</filter>
@@ -196,47 +197,51 @@
 		<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>
@@ -253,9 +258,12 @@
 		<url-pattern>/modeler/service/*</url-pattern>
 	</servlet-mapping>
 
+
 	<session-config>
 		<session-timeout>20</session-timeout>
 	</session-config>
+	 
+	 
 	<welcome-file-list>
 		<welcome-file>Main.html</welcome-file>
 	</welcome-file-list>