Merge branch 'wheng' of wuheng/eas-system into master

common/src/main/java/com/koobietech/eas/common/config/RedisConfig.java

@@ -10,7 +10,7 @@ import org.springframework.data.redis.serializer.RedisSerializer;
 @Configuration
 public class RedisConfig {
 
-    @Bean("CommonRedisTemplate")
+    @Bean
     @SuppressWarnings("all")
     public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory){
         RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();

common/src/main/java/com/koobietech/eas/common/service/impl/RedisServiceImpl.java

@@ -19,8 +19,7 @@ import java.util.concurrent.TimeUnit;
 @Service
 public class RedisServiceImpl implements RedisService {
 
-    @Autowired
-    @Qualifier("CommonRedisTemplate")
+    @Resource
     private RedisTemplate<String, Object> redisTemplate;
 
     @Override

security/src/main/java/com/koobietech/eas/security/filter/EasSecurityFilter.java

@@ -1,25 +1,21 @@
 package com.koobietech.eas.security.filter;
 
 import com.koobietech.eas.common.pojo.JwtUserDto;
-import com.koobietech.eas.common.result.JsonResult;
 import com.koobietech.eas.common.utils.JwtManager;
 import com.koobietech.eas.dao.adminLoginPojo.Permission;
 import com.koobietech.eas.dao.adminLoginPojo.UserDetail;
 import com.koobietech.eas.service.LoginRedisService;
-import org.springframework.http.*;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
-import org.springframework.web.client.RestTemplate;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import javax.annotation.Resource;
 import javax.servlet.FilterChain;
@@ -36,9 +32,6 @@ public class EasSecurityFilter extends OncePerRequestFilter {
     @Resource
     JwtManager jwtManager;
 
-    @Resource
-    private RestTemplate restTemplate;
-
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
 

service/src/main/java/com/koobietech/eas/service/impl/LoginRedisServiceImpl.java

@@ -14,8 +14,7 @@ import javax.annotation.Resource;
 @Service
 public class LoginRedisServiceImpl implements LoginRedisService {
 
-    @Autowired
-    @Qualifier("CommonRedisTemplate")
+    @Resource
     private RedisService redisService;