Merge branch 'dev' into pre-production

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factory/snm/entity/FactoryToken.java

@@ -1,4 +1,4 @@
-package com.logpm.factorydata.linsy.entity;
+package com.logpm.factory.snm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/config/InterceptorAdapterConfig.java

@@ -27,9 +27,9 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer {
 	@Override
 	public void addInterceptors(InterceptorRegistry interceptorRegistry) {
 		interceptorRegistry.addInterceptor(new FactoryAccountsInterceptor(factoryTokenService))
-			.addPathPatterns("/**").order(1);
-		interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis, environment,redisLockClient,mockLoginService))
 			.addPathPatterns("/**").order(2);
+		interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis, environment,redisLockClient,mockLoginService))
+			.addPathPatterns("/**").order(1);
 
 	}
 }

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/mapper/FactoryTokenMapper.java

@@ -17,7 +17,8 @@
 package com.logpm.factorydata.linsy.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.logpm.factorydata.linsy.entity.FactoryToken;
+import com.logpm.factory.snm.entity.FactoryToken;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 工厂账号接口日志 Mapper 接口
@@ -25,6 +26,7 @@ import com.logpm.factorydata.linsy.entity.FactoryToken;
  * @author zhy
  * @since 2023-03-28
  */
+@Mapper
 public interface FactoryTokenMapper extends BaseMapper<FactoryToken> {
 
 

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/IFactoryTokenService.java

@@ -1,6 +1,6 @@
 package com.logpm.factorydata.linsy.service;
 
-import com.logpm.factorydata.linsy.entity.FactoryToken;
+import com.logpm.factory.snm.entity.FactoryToken;
 import org.springblade.core.mp.base.BaseService;
 
 import java.security.NoSuchAlgorithmException;

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/FactoryTokenServiceImpl.java

@@ -1,7 +1,7 @@
 package com.logpm.factorydata.linsy.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.logpm.factorydata.linsy.entity.FactoryToken;
+import com.logpm.factory.snm.entity.FactoryToken;
 import com.logpm.factorydata.linsy.mapper.FactoryTokenMapper;
 import com.logpm.factorydata.linsy.service.IFactoryTokenService;
 import lombok.AllArgsConstructor;
@@ -35,7 +35,9 @@ public class FactoryTokenServiceImpl extends BaseServiceImpl<FactoryTokenMapper,
 		if (Objects.isNull(factoryToken)) {
 			QueryWrapper<FactoryToken> queryWrapper = new QueryWrapper<>();
 			queryWrapper.eq("token", token);
-			factoryToken = baseMapper.selectOne(queryWrapper);
+			// TODO 由factory提供一个feign接口获取
+			return false;
+//			factoryToken = baseMapper.selectOne(queryWrapper);
 		}