From f70072eb02fbcd4784a548be4de2370e3c813946 Mon Sep 17 00:00:00 2001
From: zwzw1219 <zwzw1219@163.com>
Date: Tue, 6 Mar 2018 09:38:55 +0800
Subject: [PATCH] =?UTF-8?q?!11=20spring=20boot=E5=8D=87=E7=BA=A7=20Merge?=
 =?UTF-8?q?=20pull=20request=20!11=20from=20zwzw1219/2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                            |  1 +
 pom.xml                                              | 12 ++++++++----
 .../java/com/zw/admin/server/config/DruidConfig.java |  8 ++++----
 .../com/zw/admin/server/config/WebMvcConfig.java     |  5 ++---
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 525b88c..db59c22 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,2 @@
 # boot-backend
+## 2018.03.06 spring boot 由1.5.10 升级到2.0.0
diff --git a/pom.xml b/pom.xml
index 4cac819..f401c58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.10.RELEASE</version>
+		<version>2.0.0.RELEASE</version>
 	</parent>
 
 	<properties>
@@ -21,7 +21,7 @@
 		<commons-lang3>3.7</commons-lang3>
 		<fastjson.version>1.2.41</fastjson.version>
 		<quartz.version>2.3.0</quartz.version>
-		<druid.version>1.1.6</druid.version>
+		<druid.version>1.1.8</druid.version>
 		<poi.version>3.17</poi.version>
 	</properties>
 
@@ -47,7 +47,6 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>${commons-lang3}</version>
 		</dependency>
 		<!-- <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> 
 			</dependency> -->
@@ -97,6 +96,12 @@
 			<artifactId>druid</artifactId>
 			<version>${druid.version}</version>
 		</dependency>
+		<!-- druid需要此日志包 -->
+		<dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+        </dependency>
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
@@ -123,7 +128,6 @@
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
 			<artifactId>quartz</artifactId>
-			<version>${quartz.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/src/main/java/com/zw/admin/server/config/DruidConfig.java b/src/main/java/com/zw/admin/server/config/DruidConfig.java
index 0afe1d4..55d9af9 100644
--- a/src/main/java/com/zw/admin/server/config/DruidConfig.java
+++ b/src/main/java/com/zw/admin/server/config/DruidConfig.java
@@ -30,9 +30,9 @@ public class DruidConfig {
 	private static final Logger log = LoggerFactory.getLogger("adminLogger");
 
 	@Bean
-	public ServletRegistrationBean druidServlet() {
+	public ServletRegistrationBean<StatViewServlet> druidServlet() {
 		log.info("init Druid Servlet Configuration ");
-		ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new StatViewServlet(),
+		ServletRegistrationBean<StatViewServlet> servletRegistrationBean = new ServletRegistrationBean<>(new StatViewServlet(),
 				"/druid/*");
 		// IP白名单
 		servletRegistrationBean.addInitParameter("allow", "127.0.0.1");
@@ -47,8 +47,8 @@ public class DruidConfig {
 	}
 
 	@Bean
-	public FilterRegistrationBean filterRegistrationBean() {
-		FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(new WebStatFilter());
+	public FilterRegistrationBean<WebStatFilter> filterRegistrationBean() {
+		FilterRegistrationBean<WebStatFilter> filterRegistrationBean = new FilterRegistrationBean<>(new WebStatFilter());
 		filterRegistrationBean.addUrlPatterns("/*");
 		filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*");
 		return filterRegistrationBean;
diff --git a/src/main/java/com/zw/admin/server/config/WebMvcConfig.java b/src/main/java/com/zw/admin/server/config/WebMvcConfig.java
index 8aa4196..a90a6ab 100644
--- a/src/main/java/com/zw/admin/server/config/WebMvcConfig.java
+++ b/src/main/java/com/zw/admin/server/config/WebMvcConfig.java
@@ -11,12 +11,11 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 import com.zw.admin.server.page.table.PageTableArgumentResolver;
 
 @Configuration
-public class WebMvcConfig extends WebMvcConfigurerAdapter {
+public class WebMvcConfig implements WebMvcConfigurer {
 
 	/**
 	 * 跨域支持
@@ -25,7 +24,7 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter {
 	 */
 	@Bean
 	public WebMvcConfigurer corsConfigurer() {
-		return new WebMvcConfigurerAdapter() {
+		return new WebMvcConfigurer() {
 			@Override
 			public void addCorsMappings(CorsRegistry registry) {
 				registry.addMapping("/**").allowedMethods("*");
-- 
Gitee