From 2ba8fa4223804e84331f9f87638f25f18ea890e4 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Thu, 15 Mar 2018 15:27:42 +0800
Subject: [PATCH] merge

---
 boot-service/pom.xml                                        | 3 ---
 boot-web/pom.xml                                            | 6 ------
 .../com/xwbing/configuration/ApplicationContextConfig.java  | 1 -
 pom.xml                                                     | 1 -
 4 files changed, 11 deletions(-)

diff --git a/boot-service/pom.xml b/boot-service/pom.xml
index 1e5f19d..c96c57e 100644
--- a/boot-service/pom.xml
+++ b/boot-service/pom.xml
@@ -42,7 +42,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
         </dependency>
         <!-- 表单校验 -->
         <dependency>
@@ -53,7 +52,6 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>2.7.3</version>
         </dependency>
         <!-- 二维码 -->
         <dependency>
@@ -87,7 +85,6 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.1</version>
         </dependency>
         <!-- servlet -->
         <dependency>
diff --git a/boot-web/pom.xml b/boot-web/pom.xml
index e82793a..7c9b457 100644
--- a/boot-web/pom.xml
+++ b/boot-web/pom.xml
@@ -67,12 +67,6 @@
             <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 6de89f5..f765314 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java
+++ b/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java
@@ -18,7 +18,6 @@ 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默认已经配置好)
diff --git a/pom.xml b/pom.xml
index 87cd1e8..d4924a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,6 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <fileUpLoad.version>1.3.1</fileUpLoad.version>
-        <lombok.version>1.16.16</lombok.version>
         <zxing.version>3.2.1</zxing.version>
         <fastjson.veersion>1.2.20</fastjson.veersion>
         <!-- 打包跳过单元测试 -->