Merge remote-tracking branch 'origin/develop' into develop

WebContent/WEB-INF/conf/gaowj/bl/applicationContext-business.xml

@@ -22,7 +22,7 @@
       <!-- 增加数据源dataSource-system -->
       <bean id="dataSource-system"  class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
             <!-- 基本属性 url、user、password -->  
-			<property name="url" value="jdbc:mysql://192.168.1.116:3306/portal_system?useUnicode=true&amp;characterEncoding=utf8&amp;autoReconnect=true&amp;useSSL=false" />  
+			<property name="url" value="jdbc:mysql://192.168.1.249:3306/portal_system?useUnicode=true&amp;characterEncoding=utf8&amp;autoReconnect=true&amp;useSSL=false" />  
 			<property name="username" value="portal_system" />  
 			<property name="password" value="portal_system" /> 
 			<property name="driverClassName" value="com.mysql.jdbc.Driver" /> 
@@ -57,9 +57,9 @@
         <!-- 增加数据源dataSource-standard -->
       <bean id="dataSource-standard"  class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
           <!-- 基本属性 url、user、password -->  
-			<property name="url" value="jdbc:mysql://192.168.1.116:3306/jw_standard?useUnicode=true&amp;characterEncoding=utf8&amp;autoReconnect=true&amp;useSSL=false" />  
-			<property name="username" value="jw_standard" />  
-			<property name="password" value="jw_standard" /> 
+			<property name="url" value="jdbc:mysql://192.168.1.249:3306/jf_standard?useUnicode=true&amp;characterEncoding=utf8&amp;autoReconnect=true&amp;useSSL=false" />  
+			<property name="username" value="jf_standard" />  
+			<property name="password" value="jf_standard" /> 
 			<property name="driverClassName" value="com.mysql.jdbc.Driver" /> 
 			
 			<!-- 配置初始化大小、最小、最大 -->  
@@ -92,9 +92,9 @@
        <!-- 增加数据源dataSource-business -->
        <bean id="dataSource-business"  class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
           <!-- 基本属性 url、user、password -->  
-			<property name="url" value="jdbc:mysql://192.168.1.116:3306/jw_apps?useUnicode=true&amp;characterEncoding=utf8&amp;autoReconnect=true&amp;useSSL=false" />  
-			<property name="username" value="jw_apps" />  
-			<property name="password" value="jw_apps" /> 
+			<property name="url" value="jdbc:mysql://192.168.1.249:3306/jf_apps?useUnicode=true&amp;characterEncoding=utf8&amp;autoReconnect=true&amp;useSSL=false" />  
+			<property name="username" value="jf_apps" />  
+			<property name="password" value="jf_apps" /> 
 			<property name="driverClassName" value="com.mysql.jdbc.Driver" /> 
 			
 			<!-- 配置初始化大小、最小、最大 -->  

WebContent/WEB-INF/web.xml

@@ -69,7 +69,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j
 	   <filter-class>org.jasig.cas.client.authentication.AuthenticationFilter</filter-class>    
 	   <init-param>    
 	      <param-name>casServerLoginUrl</param-name>    
-	      <param-value>http://cas.jfbrother.com:9003/cas-test01/login</param-value><!-- cas 服务器登录 地址  http://IP:PORT/CasWebProName/login -->    
+	      <param-value>http://cas.jfbrother.com:9003/cas-jfsso/login</param-value><!-- cas 服务器登录 地址  http://IP:PORT/CasWebProName/login -->    
 	   </init-param>    
 	   <init-param>    
 	      <!-- 这里的server是服务端的IP -->    
@@ -89,7 +89,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j
         <filter-class>org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter</filter-class>    
         <init-param>    
            <param-name>casServerUrlPrefix</param-name>    
-           <param-value>http://cas.jfbrother.com:9003/cas-test01</param-value><!-- cas 服务器地址  http://IP:PORT/CasWebProName -->    
+           <param-value>http://cas.jfbrother.com:9003/cas-jfsso</param-value><!-- cas 服务器地址  http://IP:PORT/CasWebProName -->    
         </init-param>    
         <init-param>    
            <param-name>serverName</param-name>    

WebContent/logoutcas.jsp

 <%@ page contentType="text/html; charset=UTF-8" %>
 <% 
-  System.out.println("单点退出...........");
-  session.invalidate();
+  System.out.println("单点退出中...........");
+  //session.invalidate();
   %>
 <html>
 <head> 
 <title>系统正在退出登录，请稍候...</title>
 </head>
 <body>
+<iframe src="http://portal.jfbrother.com:9003/jfV5portal/logout" style="display: none"></iframe>
 <iframe src="http://base.portal.jfbrother.com:9003/jfV4platform/logout" style="display: none"></iframe>
 <iframe src="http://bi.jfbrother.com:9003/fastBI/logout" style="display: none"></iframe>
 <iframe src="http://pc.jfbrother.com:9003/jfV5pc/logout" style="display: none"></iframe>
 <iframe src="http://fwqjk.jfbrother.com:9003/jfV5fwqjk/logout" style="display: none"></iframe>
+<iframe src="http://report.jfbrother.com:9003/jfV5report/logout" style="display: none"></iframe>
 </body>
 <script type="text/javascript">
 	function getUrl() {
@@ -20,7 +22,7 @@
 		return hostname;
 	}
     //登录中心url
-    var loginCenter = "http://cas.jfbrother.com:9003/cas-test01";
+    var loginCenter = "http://cas.jfbrother.com:9003/cas-jfsso";
     
 	var loginUrl = loginCenter + "/login?service=" + getUrl();
 	//alert("开始登出:"+loginUrl);

WebContent/system/pages/login/sampleLogin.jsp.bak

@@ -416,7 +416,7 @@ label {
             <div class="footer_logo"></div>
             <div class="footer_company_info">
                 <h1>杰夫V5微应用服务平台</h1>
-                <p>Powered By  © 2014-<%=jt.now_year() %> Jinwang.com.cn </p>
+                <p>Powered By  © 2014-<%=jt.now_year() %> jfbrother.com.cn </p>
             </div>
             <div class="footer_links">
 <!--                 <h1> -->