Merge branch 'pre-production'

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);
 
 	}

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);
 
 	}

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);
 
 	}

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);
 
 	}

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);
 	}
 }

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);
 	}
 }