From 664b5c6eefb61148a2c5b0eeda194313768cfdb3 Mon Sep 17 00:00:00 2001
From: fangcheng <fangcheng@lymsh.com>
Date: Thu, 6 Apr 2017 11:09:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9shiro?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/app-context.xml             | 28 ++++++++++++----------
 .../src/main/resources/xml/app-shiro.xml           |  5 ++--
 .../main/java/com/lyms/shiro/ShiroWebUtils.java    |  8 ++-----
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/parent/center.manager/src/main/resources/app-context.xml b/parent/center.manager/src/main/resources/app-context.xml
index 28bd261..128cfd9 100644
--- a/parent/center.manager/src/main/resources/app-context.xml
+++ b/parent/center.manager/src/main/resources/app-context.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xsi:schemaLocation="
        http://www.springframework.org/schema/beans
@@ -12,17 +11,20 @@
        http://www.springframework.org/schema/aop/spring-aop.xsd
        http://www.springframework.org/schema/mvc
        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
-
+	<bean id="placeholder" class="com.lyms.spring.PropertiesUtil">
+		<property name="locations">
+			<list>
+				<value>classpath:jdbc.properties</value>
+				<value>classpath:redis.properties</value>
+			</list>
+		</property>
+	</bean>
 	<context:annotation-config />
-	<!-- 扫描控制器 禁用use-default-filters 不重复扫描@Service,@Repository等..否则将导致事务失效 -->
 	<context:component-scan base-package="com.lyms"></context:component-scan>
-	<!-- context 容器获取扫描 -->
-	<!-- <context:component-scan base-package="com.lyms.spring" /> -->
-	<context:property-placeholder location="classpath:dev/jdbc.properties,classpath:dev/redis.properties"/>
-	
-	<bean class="com.lyms.web.listener.StartupListener"/> 
-	 
-    <bean class="com.lyms.context.AppContext"/>  
-    
-	<import resource="xml/app-*.xml" /> 
+
+	<bean class="com.lyms.web.listener.StartupListener" />
+
+	<bean class="com.lyms.context.AppContext" />
+
+	<import resource="xml/app-*.xml" />
 </beans>
\ No newline at end of file
diff --git a/parent/center.manager/src/main/resources/xml/app-shiro.xml b/parent/center.manager/src/main/resources/xml/app-shiro.xml
index 272c4da..0dce952 100644
--- a/parent/center.manager/src/main/resources/xml/app-shiro.xml
+++ b/parent/center.manager/src/main/resources/xml/app-shiro.xml
@@ -45,13 +45,12 @@
         </property>
         <property name="filterChainDefinitions">
             <value> 
-               <!--  /login = anon
+                /login = anon
                 /remote/** =anon
                 /logout = logout 
                 /static/** = anon
                 /authenticated = authc 
-                /** = user,forceLogout  -->
-                /** = anon
+                /** = user,forceLogout
             </value>
         </property>
     </bean>
diff --git a/parent/core.sdk/src/main/java/com/lyms/shiro/ShiroWebUtils.java b/parent/core.sdk/src/main/java/com/lyms/shiro/ShiroWebUtils.java
index 24d6832..c8dac60 100644
--- a/parent/core.sdk/src/main/java/com/lyms/shiro/ShiroWebUtils.java
+++ b/parent/core.sdk/src/main/java/com/lyms/shiro/ShiroWebUtils.java
@@ -138,12 +138,8 @@ public class ShiroWebUtils {
 	 * <li>修改时间：
 	 */  
 	public static final boolean isLogin(){
-		Subject currentUser = SecurityUtils.getSubject();
-		if (null != currentUser) {
-			Session session = currentUser.getSession();
-			if (null != session) {
-				return true;
-			}
+		if (null != getCurrentUser()) {
+			return true;
 		}
 		return false;
 	}
-- 
1.8.3.1