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

gkaq/yjpt-java/trunk/resources/spring/application.properties

@@ -1,8 +1,8 @@
 #***************************************  jdbc info  ********************************************#
 jdbc.driver                 = oracle.jdbc.driver.OracleDriver
 jdbc.url                      = jdbc:oracle:thin:@192.168.57.36:1521:orcl
-jdbc.username           = yjptzj
-jdbc.password            =yjpt
+jdbc.username           = yjptpro
+jdbc.password            = yjpt
 hibernate.dialect        = org.hibernate.dialect.Oracle10gDialect
 #********************************** qlyg jdbc info**********************************************#
 jdbc.qlyg.url               = jdbc:oracle:thin:@192.168.57.36:1521:orcl
@@ -12,6 +12,7 @@ jdbc.qlyg.password     = jsgk
 jdbc.xzzx.url               = jdbc:oracle:thin:@192.168.57.36:1521:orcl
 jdbc.xzzx.username    = xzzx
 jdbc.xzzx.password     = xzzx
+
 #dbcp settings
 dbcp.maxIdle=30
 dbcp.minIdle=5
@@ -21,12 +22,11 @@ hibernate.hbm2ddl.auto=
 
 
 # local WebService
-web.service.url=localhost
-web.service.port=8088
+web.service.url=192.168.57.76
+web.service.port=8089
 
 # Province WebService 
-web.province.service.url=192.168.57.74
-web.province.service.port=8089
+
 #\u4f5c\u4e1a\u7533\u62a5\uff0c\u95f4\u9694\u7684\u65f6\u95f4\uff0c\u5fc5\u987b\u5b8c\u6210
 zysb.time=7
 ##\u6e2f\u53e3\u7ecf\u8425\u8bb8\u53ef\u8bc1\u6709\u6548\u671f\u8fc7\u671f \uff0c\u63d0\u524d\u591a\u5c11\u5929\u63d0\u9192
@@ -46,7 +46,7 @@ zysb.check=N
 #\u5bc6\u94a5
 my_yjpt_gkj=yjpt_gkj
 #\u5bc6\u7801\u6709\u6548\u671f\u9650
-password.yxq=20161001
+password.yxq=20171231
 
 #\u9644\u8bc1\u4e8c\u7ef4\u7801\u5730\u5740
 fz.qrcode=http://m.yuanxd.com:8091/weixinoa/mobile/fuzheng/wxhwzyfz.jsp?code=

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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: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"
@@ -8,40 +8,38 @@
 		<description>系统版本</description>
 		<param-name>version</param-name>
 		<param-value>4.2.0</param-value>
-	</context-param>
+	</context-param>	
 	<context-param>
 		<description>0:省级;1:市级</description>
 		<param-name>deploy_mode</param-name>
-		<param-value>1</param-value>
+		<param-value>0</param-value>
 	</context-param>
 	<context-param>
 		<description>区域代码</description>
 		<param-name>city_code</param-name>
-		<param-value>90011</param-value>
+		<param-value>900</param-value>
 	</context-param>
 	<context-param>
 		<description>是否使用地图资源系统(Y/N)</description>
 		<param-name>open_map</param-name>
-		<param-value>N</param-value>
+		<param-value>Y</param-value>
 	</context-param>
 	<context-param>
 		<description>是否与权力阳光同步(Y/N)</description>
 		<param-name>qlyg_sync</param-name>
-		<param-value>N</param-value>
+		<param-value>Y</param-value>
 	</context-param>
 	<context-param>
 		<description>是否在危险品审批中启用签章功能(Y/N)</description>
 		<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>
@@ -75,7 +73,7 @@
 	<context-param>
 		<description>默认密码</description>
 		<param-name>default_password</param-name>
-		<param-value>123456</param-value>
+		<param-value>yjpt.123</param-value>
 	</context-param>
 	<context-param>
 		<description>上传文件大小(M)</description>
@@ -85,9 +83,8 @@
 	<context-param>
 		<description>上传照片大小(K)</description>
 		<param-name>upload_image_size</param-name>
-		<param-value>500</param-value>
+		<param-value>250</param-value>
 	</context-param>
-
 	<context-param>
 		<description>初始化菜单-经营人基本信息</description>
 		<param-name>init_menu</param-name>
@@ -111,10 +108,8 @@
 	<context-param>
 		<description>同步最终状态（根据dataChangeService数据源配置计算最大值）</description>
 		<param-name>qlyg_result</param-name>
-		<param-value>3</param-value>
+		<param-value>1</param-value>
 	</context-param>
-
-
 	<filter>
 		<filter-name>encodingFilter</filter-name>
 		<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
@@ -131,64 +126,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 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 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-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-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://10.1.30.117:8081/znjg/</param-value>
+			</init-param>
+			<init-param>
+				<param-name>serverName</param-name>
+				<param-value>http://10.1.30.114: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://10.1.30.117:8081/znjg/</param-value>
+			</init-param>
+			<init-param>
+				<param-name>serverName</param-name>
+				<param-value>http://10.1.30.114: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-name>LoginFilter</filter-name>
 		<filter-class>com.jtgh.yjpt.common.LoginFilter</filter-class>
@@ -197,51 +193,48 @@
 		<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>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>
+		<servlet-name>InitServlet</servlet-name>
+		<servlet-class>com.jtgh.yjpt.common.servlet.InitServlet</servlet-class>
+		<load-on-startup>99</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>
-	
 	<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>
+		<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>InitServlet</servlet-name>
-		<servlet-class>com.jtgh.yjpt.common.servlet.InitServlet</servlet-class>
-		<load-on-startup>99</load-on-startup>
-	</servlet>
-	 
-	
+	<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>
 	<!-- Restlet adapter, used to expose modeler functionality through REST -->
 	<servlet>
 		<servlet-name>RestletServlet</servlet-name>
@@ -258,12 +251,9 @@
 		<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>