update filter servlert dependency spring-boot 1.5.6

fireinrain · Sep 11, 2017 · 781f1bd · 781f1bd
1 parent fe99c17
commit 781f1bd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/spring-boot-mybatis/src/main/java/com/lance/mybatis/SimpleApplication.java b/spring-boot-mybatis/src/main/java/com/lance/mybatis/SimpleApplication.java
@@ -6,8 +6,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.embedded.FilterRegistrationBean;
-import org.springframework.boot.context.embedded.ServletRegistrationBean;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 
 import com.alibaba.druid.support.http.StatViewServlet;

diff --git a/spring-boot-shiro-redis/pom.xml b/spring-boot-shiro-redis/pom.xml
@@ -16,12 +16,14 @@
 	<url>http://maven.apache.org</url>
 
 	<properties>
-		<shiro.version>1.2.5</shiro.version>
+		<shiro.version>1.2.6</shiro.version>
+		<java.version>1.8</java.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<dependencies>
 		<dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-redis</artifactId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 		<dependency>
 			<groupId>org.springframework.session</groupId>

diff --git a/spring-boot-shiro-redis/src/main/java/com/lance/shiro/config/ShiroConfig.java b/spring-boot-shiro-redis/src/main/java/com/lance/shiro/config/ShiroConfig.java
@@ -10,7 +10,7 @@
 import org.apache.shiro.web.filter.authc.AnonymousFilter;
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.apache.shiro.web.session.mgt.DefaultWebSessionManager;
-import org.springframework.boot.context.embedded.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;

diff --git a/spring-boot-sitemesh/src/main/java/com/lance/sitemesh/common/WebConfig.java b/spring-boot-sitemesh/src/main/java/com/lance/sitemesh/common/WebConfig.java
@@ -1,16 +1,16 @@
 package com.lance.sitemesh.common;
 
-import org.springframework.boot.context.embedded.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 @Configuration
 public class WebConfig extends WebMvcConfigurerAdapter{
 	/**
-	 * 装饰器
+	 * 瑁呴グ鍣�
 	 * @return
-	 * 2016年8月27日下午12:37:20
+	 * 2016骞�8鏈�27鏃ヤ笅鍗�12:37:20
 	 */
 	@Bean
 	public FilterRegistrationBean siteMeshFilter(){