From 9d6f4f4a43d7f8979dad063c9a761c99e7dffff0 Mon Sep 17 00:00:00 2001
From: doufenghu <doufenghu@nismail.iie.ac.cn>
Date: Mon, 8 Oct 2018 11:18:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=89=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=EF=BC=8C=E6=B8=85=E9=99=A4=E4=B8=AD=E6=96=87=E7=A9=BA=E6=A0=BC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/applicationContext-redis.xml    | 18 ++---
 .../resources/applicationContext-shiro.xml    | 78 +++++++++----------
 src/main/resources/jdbc.properties            |  8 +-
 3 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/src/main/resources/applicationContext-redis.xml b/src/main/resources/applicationContext-redis.xml
index 065dc9d..7b58b76 100644
--- a/src/main/resources/applicationContext-redis.xml
+++ b/src/main/resources/applicationContext-redis.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:jdbc="http://www.springframework.org/schema/jdbc" xmlns:jee="http://www.springframework.org/schema/jee"
-	xmlns:p="http://www.springframework.org/schema/p" xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:tool="http://www.springframework.org/schema/tool" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:util="http://www.springframework.org/schema/util" xmlns:task="http://www.springframework.org/schema/task"
-	xsi:schemaLocation="
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+	   xmlns:jdbc="http://www.springframework.org/schema/jdbc" xmlns:jee="http://www.springframework.org/schema/jee"
+	   xmlns:p="http://www.springframework.org/schema/p" xmlns:tx="http://www.springframework.org/schema/tx"
+	   xmlns:tool="http://www.springframework.org/schema/tool" xmlns:aop="http://www.springframework.org/schema/aop"
+	   xmlns:util="http://www.springframework.org/schema/util" xmlns:task="http://www.springframework.org/schema/task"
+	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd
 		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.1.xsd
@@ -16,7 +16,7 @@
 		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.1.xsd">
 	<!-- 加载配置文件,不知道为啥不能加载redis.properties的内容,先把redis.properties里面的内容放到jdbc.properties里面吧 -->
 	<context:property-placeholder
-		ignore-unresolvable="true" location="classpath:jdbc.properties" />
+			ignore-unresolvable="true" location="classpath:jdbc.properties" />
 
 	<bean id="poolConfig" class="redis.clients.jedis.JedisPoolConfig">
 		<property name="maxIdle" value="${redis.maxIdle}" />
@@ -30,7 +30,7 @@
 		<constructor-arg name="poolConfig" ref="poolConfig" />
 		<constructor-arg name="host" value="${redis.host}" />
 		<constructor-arg name="port" value="${redis.port}"
-			type="int" />
+						 type="int" />
 	</bean>
 
 
diff --git a/src/main/resources/applicationContext-shiro.xml b/src/main/resources/applicationContext-shiro.xml
index ae0a624..2e0b2b8 100644
--- a/src/main/resources/applicationContext-shiro.xml
+++ b/src/main/resources/applicationContext-shiro.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="
+	   xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
 		http://www.springframework.org/schema/context  http://www.springframework.org/schema/context/spring-context-4.1.xsd"
-	default-lazy-init="true">
-	
+	   default-lazy-init="true">
+
 	<description>Shiro Configuration</description>
-	
-	 <!-- 引入jdbc.properties,加密密码 ;<context:property-placeholder location="classpath:jdbc.properties" />-->
+
+	<!-- 引入jdbc.properties,加密密码 ;<context:property-placeholder location="classpath:jdbc.properties" />-->
 	<bean id="propertyConfigurer"  class="com.nis.util.PropertyPlaceholderConfigurerCrypt">
 		<property name="locations" >
 			<list>
@@ -17,18 +17,18 @@
 			</list>
 		</property>
 	</bean>
-	
+
 	<!-- autodetection of such annotated controllers -->
-	<!-- 使用Annotation自动注册Bean，解决事物失效问题：在主容器中不扫描@Controller注解，在SpringMvc中只扫描@Controller注解。  -->
+	<!-- 使用Annotation自动注册Bean，解决事物失效问题：在主容器中不扫描@Controller注解，在SpringMvc中只扫描@Controller注解。-->
 	<context:component-scan base-package="com.nis.web">
 		<context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
 	</context:component-scan>
-	
+
 	<!-- 缓存配置 -->
 	<bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
 		<property name="configLocation" value="classpath:${ehcache.configFile}" />
 	</bean>
-	
+
 	<!-- Shiro权限过滤过滤器定义 -->
 	<bean name="shiroFilterChainDefinitions" class="java.lang.String">
 		<constructor-arg>
@@ -39,18 +39,18 @@
 				/login = authc
 				/logout = logout
 				${adminPath}/** = user
-				<!-- 
+				<!--
 				/act/rest/service/editor/** = perms[act:model:edit]
 				/act/rest/service/model/** = perms[act:model:edit]
 				/act/rest/service/** = user
 				/ReportServer/** = user
 				 -->
-				
+
 			</value>
 		</constructor-arg>
 	</bean>
-	
-	
+
+
 	<!-- 安全认证过滤器 -->
 	<bean id="shiroFilter" class="org.apache.shiro.spring.web.ShiroFilterFactoryBean">
 		<property name="securityManager" ref="securityManager"></property>
@@ -66,42 +66,42 @@
 		<property name="filterChainDefinitions">
 			<ref bean="shiroFilterChainDefinitions"/>
 		</property>
-		
+
 	</bean>
-	
-	
-	<!-- CAS认证过滤器 -->  
-	<bean id="casFilter" class="org.apache.shiro.cas.CasFilter">  
+
+
+	<!-- CAS认证过滤器 -->
+	<bean id="casFilter" class="org.apache.shiro.cas.CasFilter">
 		<property name="failureUrl" value="/login"/>
 	</bean>
-	
+
 	<!-- 定义Shiro安全管理配置 -->
 	<bean id="securityManager" class="org.apache.shiro.web.mgt.DefaultWebSecurityManager">
 		<property name="realm" ref="systemAuthorizingRealm" />
 		<property name="sessionManager" ref="sessionManager" />
 		<property name="cacheManager" ref="shiroCacheManager" />
 	</bean>
-	
+
 	<!-- 自定义会话管理配置 -->
-	<bean id="sessionManager" class="com.nis.web.security.SessionManager"> 
+	<bean id="sessionManager" class="com.nis.web.security.SessionManager">
 		<property name="sessionDAO" ref="sessionDAO"/>
-		
+
 		<!-- 会话超时时间，单位：毫秒  -->
 		<property name="globalSessionTimeout" value="${session.sessionTimeout}"/>
-		
+
 		<!-- 定时清理失效会话, 清理用户直接关闭浏览器造成的孤立会话   -->
 		<property name="sessionValidationInterval" value="${session.sessionTimeoutClean}"/>
-<!--  		<property name="sessionValidationSchedulerEnabled" value="false"/> -->
- 		<property name="sessionValidationSchedulerEnabled" value="true"/>
- 		
+		<!--  		<property name="sessionValidationSchedulerEnabled" value="false"/> -->
+		<property name="sessionValidationSchedulerEnabled" value="true"/>
+
 		<property name="sessionIdCookie" ref="sessionIdCookie"/>
 		<property name="sessionIdCookieEnabled" value="true"/>
 	</bean>
-	
+
 	<!-- 指定本系统SESSIONID, 默认为: JSESSIONID 问题: 与SERVLET容器名冲突, 如JETTY, TOMCAT 等默认JSESSIONID,
 		当跳出SHIRO SERVLET时如ERROR-PAGE容器会为JSESSIONID重新分配值导致登录会话丢失! -->
 	<bean id="sessionIdCookie" class="org.apache.shiro.web.servlet.SimpleCookie">
-	    <constructor-arg name="name" value="nis.session.id"/>
+		<constructor-arg name="name" value="nis.session.id"/>
 	</bean>
 
 	<bean id="sessionDAO" class="com.nis.web.security.CacheSessionDAO">
@@ -109,25 +109,25 @@
 		<property name="activeSessionsCacheName" value="activeSessionsCache" />
 		<property name="cacheManager" ref="shiroCacheManager" />
 	</bean>
-	
+
 	<!-- 定义授权缓存管理器 -->
-<!-- 	<bean id="shiroCacheManager" class="com.thinkgem.jeesite.common.security.shiro.cache.SessionCacheManager" /> -->
+	<!-- 	<bean id="shiroCacheManager" class="com.thinkgem.jeesite.common.security.shiro.cache.SessionCacheManager" /> -->
 	<bean id="shiroCacheManager" class="org.apache.shiro.cache.ehcache.EhCacheManager">
 		<property name="cacheManager" ref="cacheManager"/>
 	</bean>
-	
+
 	<!-- 保证实现了Shiro内部lifecycle函数的bean执行 -->
 	<bean id="lifecycleBeanPostProcessor" class="org.apache.shiro.spring.LifecycleBeanPostProcessor"/>
-	
+
 	<!-- AOP式方法级权限检查,enable shiro annotations for Spring-configured beans.only run after  -->
 	<bean class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator" depends-on="lifecycleBeanPostProcessor">
 		<property name="proxyTargetClass" value="true" />
 	</bean>
 	<bean class="org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor">
-    	<property name="securityManager" ref="securityManager"/>
+		<property name="securityManager" ref="securityManager"/>
 	</bean>
-	
-	   
+
+
 	<!-- 登陆时验证码的配置 -->
 	<bean id="captchaProducer" class="com.google.code.kaptcha.impl.DefaultKaptcha">
 		<property name="config">
@@ -164,9 +164,9 @@
 			</bean>
 		</property>
 	</bean>
-	    
-  	
-  	
+
+
+
 
 
 </beans>
diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties
index 84e7f92..21bf214 100644
--- a/src/main/resources/jdbc.properties
+++ b/src/main/resources/jdbc.properties
@@ -4,8 +4,10 @@ jdbc.log.driver=com.mysql.jdbc.Driver
 #jdbc.log.url=jdbc:mysql://10.0.6.249:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
 #华严
 #jdbc.log.url=jdbc:mysql://192.168.11.242:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
+#元辰鑫外网-开发环境
+jdbc.log.url=jdbc:mysql://192.168.10.204:3306/galaxy-dev?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
 #元辰鑫外网
-jdbc.log.url=jdbc:mysql://192.168.10.204:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
+#jdbc.log.url=jdbc:mysql://192.168.10.204:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
 #亦庄演示环境
 #jdbc.log.url=jdbc:mysql://10.3.48.5:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
 jdbc.log.username=root
@@ -139,8 +141,10 @@ minio_bucketName=maat-redis
 #redis.host=10.0.6.249
 #华严
 #redis.host=192.168.11.243
+#元辰鑫外网-开发环境
+redis.host=192.168.10.12
 #元辰鑫外网
-redis.host=192.168.10.205
+#redis.host=192.168.10.205
 #亦庄测试环境
 #redis.host=192.168.10.215
 #亦庄演示环境