升级springboot到1.4.0

Author: yangjie

pom.xml

@@ -15,74 +15,65 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
-	<parent><!-- spring boot通用配置 -->
+	<parent><!-- spring boot父级依赖, 定义了常用包的version -->
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.7.RELEASE</version>
+		<version>1.4.0.RELEASE</version>
 	</parent>
 
 	<dependencies>
-	
-		<dependency><!-- spring web通用配置 -->
+		<dependency><!-- 核心starter, 包含自动配置/日志/yaml配置文件支持等 -->
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+		</dependency>
+		<dependency><!-- web项目开发支持, 包含tomcat和springmvc等 -->
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-		
 		<dependency><!-- 用于内嵌tomcat解析jsp -->
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-jasper</artifactId>
         </dependency>
-        
         <dependency><!-- jsp中使用jstl -->
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
         </dependency>
-		
 		<dependency><!-- mysql驱动 -->
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
-		
 		<dependency><!-- tomcat 连接池-->
 			<groupId>org.apache.tomcat</groupId>
 			<artifactId>tomcat-jdbc</artifactId>
 		</dependency>
-		
 		<dependency><!-- 使用spring声明式等 -->
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jdbc</artifactId>
 		</dependency>
-	
 		<dependency><!-- mybatis -->
 			<groupId>org.mybatis</groupId>
 			<artifactId>mybatis</artifactId>
 			<version>3.3.0</version>
 		</dependency>
-		
 		<dependency><!-- spring操作mybatis插件 -->
 			<groupId>org.mybatis</groupId>
 			<artifactId>mybatis-spring</artifactId>
 			<version>1.2.3</version>
 		</dependency>
-		
-		
+
 		<dependency><!-- 用于spring测试 -->
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-			
 		<dependency><!-- 用于单元测试 -->
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
-		
 	</dependencies>
 
-	
 	<build>
-	
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
@@ -104,7 +95,6 @@
 				</configuration>
 			</plugin>
 		</plugins>
-		
 	</build>
 
 </project>

src/main/java/org/yangjie/Application.java

@@ -1,27 +1,26 @@
 package org.yangjie;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.yangjie.config.WebMvcConfig;
 
 /**
  * 程序入口, 启动器
+ * 
+ * 此注解等同与以下三个注解:
+ * @Configuration 此类为配置类
+ * @ComponentScan 扫描当前目录下所有包
+ * @EnableAutoConfiguration 开启根据依赖包进行自动配置
  */
 @SpringBootApplication
-@EnableAutoConfiguration
 public class Application {
 
-	private static Logger logger = Logger.getLogger(Application.class);
+	private static Logger logger = LoggerFactory.getLogger(Application.class);
 
-	
 	public static void main(String[] args) {
-		
-		SpringApplication.run(WebMvcConfig.class, args);
-		
+		SpringApplication.run(Application.class, args);
 		logger.info("server is running...");
-		
 	}
 
 }

src/main/java/org/yangjie/config/WebMvcConfig.java

@@ -1,11 +1,15 @@
 package org.yangjie.config;
 
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 @Configuration
-@ComponentScan("org.yangjie")
 public class WebMvcConfig extends WebMvcConfigurerAdapter {
+
+	@Override // 默认首页
+	public void addViewControllers(ViewControllerRegistry registry) {
+		registry.addViewController("/").setViewName("/login.jsp");
+	}
 
 }

src/main/resources/application.yml

@@ -1,3 +1,8 @@
+##服务配置
+server:
+  port: 8080
+
+
 ##数据库配置
 dataSource:
   driverClassName: com.mysql.jdbc.Driver
@@ -14,9 +19,6 @@ dataSource:
   removeAbandoned: true           ##是否进行无用链接回收, 默认: false
   removeAbandonedTimeout: 60    ##链接有效期,超时将被回收(秒), 默认: 60
 
-##服务配置
-server:
-  port: 8080
 
 ##日志配置
 logging:

src/test/java/org/yangjie/BaseTest.java

@@ -2,18 +2,16 @@
 
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.web.context.WebApplicationContext;
-import org.yangjie.config.WebMvcConfig;;
+import org.springframework.web.context.WebApplicationContext;;
 
 /**
  * Junit测试基类
  */
 @WebAppConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = WebMvcConfig.class)
+//@SpringApplicationConfiguration(classes = WebMvcConfig.class)
 public class BaseTest{
 
 	@Autowired