From 67e79909e7dd7a48eca0a2300831af92fd71e8ab Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 5 Jun 2024 11:50:12 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96factory=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/factory/config/InterceptorAdapterConfig.java | 4 +++- .../interceptor/LocalServerLoginAccountsInterceptor.java | 1 - .../logpm/warehouse/config/InterceptorAdapterConfig.java | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java index 190350ed0..a0e1e063d 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java @@ -6,6 +6,7 @@ import com.logpm.factory.interceptor.LocalServerLoginAccountsInterceptor; import com.logpm.factory.interceptor.ZbFactoryAccountsInterceptor; import com.logpm.factory.props.ZbFactoryProperties; import lombok.AllArgsConstructor; +import org.springblade.common.component.MockLoginService; import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.redis.lock.RedisLockClient; import org.springframework.context.annotation.Configuration; @@ -26,6 +27,7 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer { private final Environment environment; private final RedisLockClient redisLockClient; + private final MockLoginService mockLoginService; @Override @@ -38,7 +40,7 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer { .excludePathPatterns("/factory/common/**").order(2); interceptorRegistry.addInterceptor(new ZbFactoryAccountsInterceptor(zbFactoryProperties)) .addPathPatterns("/factory/zb/**").order(3); - interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis,environment,redisLockClient)).addPathPatterns("/**").order(1); + interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis,redisLockClient,mockLoginService)).addPathPatterns("/**").order(1); } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/LocalServerLoginAccountsInterceptor.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/LocalServerLoginAccountsInterceptor.java index e1a97c94a..e3e3f308f 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/LocalServerLoginAccountsInterceptor.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/LocalServerLoginAccountsInterceptor.java @@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit; public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapter { private final BladeRedis bladeRedis; - private final Environment environment; private final RedisLockClient redisLockClient; private final MockLoginService mockLoginService; diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/InterceptorAdapterConfig.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/InterceptorAdapterConfig.java index 34240ea2d..5645722ca 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/InterceptorAdapterConfig.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/InterceptorAdapterConfig.java @@ -2,6 +2,7 @@ package com.logpm.warehouse.config; import com.logpm.warehouse.config.interceptor.LocalServerLoginAccountsInterceptor; import lombok.AllArgsConstructor; +import org.springblade.common.component.MockLoginService; import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.redis.lock.RedisLockClient; import org.springframework.context.annotation.Configuration; @@ -15,14 +16,13 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer { private final BladeRedis redis; - private final Environment environment; - private final RedisLockClient redisLockClient; + private final MockLoginService mockLoginService; @Override public void addInterceptors(InterceptorRegistry interceptorRegistry) { - interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis,environment,redisLockClient)).addPathPatterns("/oldpush/**").order(1); + interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis,redisLockClient,mockLoginService)).addPathPatterns("/oldpush/**").order(1); // interceptorRegistry.addInterceptor(new ParameterCombinationInterceptor()) // .addPathPatterns("/**");