From 31c7f0e21cc76e7d2cc3a1a8d3bbf7aea6928551 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Thu, 15 Mar 2018 11:25:35 +0800
Subject: [PATCH] merge

---
 boot-web/pom.xml                                            | 6 ++++++
 .../com/xwbing/configuration/ApplicationContextConfig.java  | 1 +
 2 files changed, 7 insertions(+)

diff --git a/boot-web/pom.xml b/boot-web/pom.xml
index 7c9b457..e82793a 100644
--- a/boot-web/pom.xml
+++ b/boot-web/pom.xml
@@ -67,6 +67,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
+        <!-- 支持@ConfigurationProperties注解-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
     <build>
         <finalName>boot-web</finalName>
diff --git a/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java b/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java
index f765314..6de89f5 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java
+++ b/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java
@@ -18,6 +18,7 @@ import javax.servlet.Filter;
 @Configuration//相当于.xml文件中的<beans></beans>
 //@Import(xxx.class)//用来导入其他配置类
 //@ImportResource("classpath:applicationContext.xml")//用来加载其他xml配置文件
+//@ConfigurationProperties(prefix="myProps") //接收application.yml中的myProps下面的所有属性
 public class ApplicationContextConfig {
     /**
      * encoding编码问题(springBoot默认已经配置好)