shiyue 1 ano atrás
pai
commit
39c610aff7

+ 3 - 1
energy-manage-service/src/main/java/com/energy/manage/service/config/LoginVerifyInterceptorConf.java

@@ -10,7 +10,9 @@ import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-@Component
+
+@Configuration
+@ConditionalOnProperty(value = "energy.login.enabled", havingValue = "true")
 public class LoginVerifyInterceptorConf extends WebMvcConfigurationSupport {
 
     @Bean

+ 5 - 5
energy-manage-service/src/main/java/com/energy/manage/service/filter/LoginVerifyInterceptor.java

@@ -111,11 +111,11 @@ public class LoginVerifyInterceptor implements HandlerInterceptor {
         }
         log.info("userMap >>> " + userMap.size() + " userName " + userMap.get("userName"));
         String rediskey = String.format(ManagerRedisKeyConstant.SYSTEM_USER_LOGIN_INFO, userMap.get("userName"));
-//        Optional<Object> userOrgJson = Optional.ofNullable(stringRedisTemplate.opsForValue().get(rediskey));
-//        if (!userOrgJson.isPresent()) {
-//            logger.warn(String.format("用户:%s token失效,访问系统被拦截", userMap.get("userName")));
-//            throw new TokenInvalidException();
-//        }
+        Optional<Object> userOrgJson = Optional.ofNullable(stringRedisTemplate.opsForValue().get(rediskey));
+        if (!userOrgJson.isPresent()) {
+            logger.warn(String.format("用户:%s token失效,访问系统被拦截", userMap.get("userName")));
+            throw new TokenInvalidException();
+        }
         // 验证 token
         JWTVerifier jwtVerifier = JWT.require(Algorithm.HMAC256(userMap.get("userPassword"))).build();
         try {

+ 3 - 0
energy-manage-service/src/main/resources/bootstrap.properties

@@ -59,3 +59,6 @@ graphSets.properties=generatorSpeed,generatorTorque,cp,tsr,pitchAngle,activePowe
 #需要特设处理分析类型属性
 analysis.properties=configAnalysis
 
+#拦截器是否生效
+energy.login.enabled=true
+