From 3ec7598f20fbc3b29a6c8195da468bbe2818317c Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Sat, 10 Mar 2018 18:33:04 +0800
Subject: [PATCH] merge

---
 boot-service/src/main/java/com/xwbing/redis/RedisService.java | 4 ++--
 .../src/main/java/com/xwbing/service/other/MailService.java   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/redis/RedisService.java b/boot-service/src/main/java/com/xwbing/redis/RedisService.java
index 269f7e3..922b254 100644
--- a/boot-service/src/main/java/com/xwbing/redis/RedisService.java
+++ b/boot-service/src/main/java/com/xwbing/redis/RedisService.java
@@ -7,13 +7,13 @@ package com.xwbing.redis;
  * 作者:  xiangwb
  */
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -21,7 +21,7 @@ import java.util.Set;
 @Component
 @PropertySource("classpath:redis.properties")
 public class RedisService {
-    @Autowired
+    @Resource
     private JedisPool jedisPool;
     @Value("${redisCode}")
     private String redisCode;
diff --git a/boot-service/src/main/java/com/xwbing/service/other/MailService.java b/boot-service/src/main/java/com/xwbing/service/other/MailService.java
index 190f879..1695c7e 100644
--- a/boot-service/src/main/java/com/xwbing/service/other/MailService.java
+++ b/boot-service/src/main/java/com/xwbing/service/other/MailService.java
@@ -2,7 +2,6 @@ package com.xwbing.service.other;
 
 import com.xwbing.exception.BusinessException;
 import com.xwbing.util.RestMessage;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.mail.SimpleMailMessage;