From ae52793cf527d0272d272ce481501cbdc8e6f3fa Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 5 Jun 2024 12:00:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0=20?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factorydata/zbom/config/InterceptorAdapterConfig.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/config/InterceptorAdapterConfig.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/config/InterceptorAdapterConfig.java index 545afdee9..726556923 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/config/InterceptorAdapterConfig.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/config/InterceptorAdapterConfig.java @@ -5,7 +5,9 @@ import com.logpm.factorydata.zbom.interceptor.ZbFactoryAccountsInterceptor; import com.logpm.factorydata.zbom.pros.ZbFactoryProperties; import com.logpm.factorydata.zbom.service.IFactoryTokenService; 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; import org.springframework.core.env.Environment; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; @@ -18,12 +20,13 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer { private final BladeRedis redis; private final ZbFactoryProperties zbFactoryProperties; private final Environment environment; - + private final RedisLockClient redisLockClient; + private final MockLoginService mockLoginService; @Override public void addInterceptors(InterceptorRegistry interceptorRegistry) { // interceptorRegistry.addInterceptor(new ZbFactoryAccountsInterceptor(zbFactoryProperties)) // .addPathPatterns("/**").order(2); - interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis, environment)) + interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis,environment,redisLockClient,mockLoginService)) .addPathPatterns("/**").order(3); } } From 3dcae62b546c5cd4131b4a425644f198ae62311b Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 5 Jun 2024 12:14:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0=20?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jinpai/config/InterceptorAdapterConfig.java | 7 +++++-- .../factorydata/linsy/config/InterceptorAdapterConfig.java | 7 +++++-- .../factorydata/mwh/config/InterceptorAdapterConfig.java | 7 +++++-- .../factorydata/olo/config/InterceptorAdapterConfig.java | 6 +++++- .../suofeiya/config/InterceptorAdapterConfig.java | 6 +++++- 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/config/InterceptorAdapterConfig.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/config/InterceptorAdapterConfig.java index 3b27885ea..505fd7997 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/config/InterceptorAdapterConfig.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/config/InterceptorAdapterConfig.java @@ -4,7 +4,9 @@ import com.logpm.factorydata.jinpai.interceptor.FactoryAccountsInterceptor; import com.logpm.factorydata.jinpai.interceptor.LocalServerLoginAccountsInterceptor; import com.logpm.factorydata.jinpai.service.IFactoryTokenService; 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; import org.springframework.core.env.Environment; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; @@ -19,13 +21,14 @@ 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 FactoryAccountsInterceptor(factoryTokenService)) // .addPathPatterns("/**").order(1); - interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis, environment)) + interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis, environment,redisLockClient,mockLoginService)) .addPathPatterns("/**").order(2); } diff --git a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/config/InterceptorAdapterConfig.java b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/config/InterceptorAdapterConfig.java index ef8d1e97d..6b0a7ec6f 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/config/InterceptorAdapterConfig.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/config/InterceptorAdapterConfig.java @@ -4,7 +4,9 @@ import com.logpm.factorydata.linsy.interceptor.FactoryAccountsInterceptor; import com.logpm.factorydata.linsy.interceptor.LocalServerLoginAccountsInterceptor; import com.logpm.factorydata.linsy.service.IFactoryTokenService; 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; import org.springframework.core.env.Environment; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; @@ -19,13 +21,14 @@ 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 FactoryAccountsInterceptor(factoryTokenService)) .addPathPatterns("/**").order(1); - interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis, environment)) + interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis, environment,redisLockClient,mockLoginService)) .addPathPatterns("/**").order(2); } diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/config/InterceptorAdapterConfig.java b/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/config/InterceptorAdapterConfig.java index 2b45b47c2..5c06f431f 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/config/InterceptorAdapterConfig.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/config/InterceptorAdapterConfig.java @@ -4,7 +4,9 @@ import com.logpm.factorydata.mwh.interceptor.FactoryAccountsInterceptor; import com.logpm.factorydata.mwh.interceptor.LocalServerLoginAccountsInterceptor; import com.logpm.factorydata.mwh.service.IFactoryTokenService; 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; import org.springframework.core.env.Environment; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; @@ -19,13 +21,14 @@ 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 FactoryAccountsInterceptor(factoryTokenService)) // .addPathPatterns("/**").order(1); - interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis, environment)) + interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis, environment,redisLockClient,mockLoginService)) .addPathPatterns("/**").order(2); } diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/config/InterceptorAdapterConfig.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/config/InterceptorAdapterConfig.java index 1662e1839..17a1ebb4a 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/config/InterceptorAdapterConfig.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/config/InterceptorAdapterConfig.java @@ -4,7 +4,9 @@ import com.logpm.factorydata.olo.interceptor.FactoryAccountsInterceptor; import com.logpm.factorydata.olo.interceptor.LocalServerLoginAccountsInterceptor; import com.logpm.factorydata.olo.service.IFactoryTokenService; 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; import org.springframework.core.env.Environment; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; @@ -19,13 +21,15 @@ 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 FactoryAccountsInterceptor(factoryTokenService)) // .addPathPatterns("/**").order(1); - interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis, environment)) + interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis, environment,redisLockClient,mockLoginService)) .addPathPatterns("/**").order(2); } diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/config/InterceptorAdapterConfig.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/config/InterceptorAdapterConfig.java index c68f16e09..1ce93e7dd 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/config/InterceptorAdapterConfig.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/config/InterceptorAdapterConfig.java @@ -4,7 +4,9 @@ import com.logpm.factorydata.suofeiya.interceptor.FactoryAccountsInterceptor; import com.logpm.factorydata.suofeiya.interceptor.LocalServerLoginAccountsInterceptor; import com.logpm.factorydata.suofeiya.service.IFactoryTokenService; 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; import org.springframework.core.env.Environment; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; @@ -17,12 +19,14 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer { private final IFactoryTokenService factoryTokenService; 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 FactoryAccountsInterceptor(factoryTokenService)) // .addPathPatterns("/**").order(1); - interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis, environment)) + interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis, environment,redisLockClient,mockLoginService)) .addPathPatterns("/**").order(2); } }