fix:完善模拟登陆

blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -93,16 +93,16 @@ public interface LauncherConstant {
 	/**
 	 * 本地登录 dev地址
 	 */
-	String APPLICATION_DEV_LOGIN_ADDR = "192.168.5.6:13000";
+	String APPLICATION_DEV_LOGIN_ADDR = "192.168.5.14:13000";
 	/**
 	 * 本地登录 test地址
 	 */
-	String APPLICATION_TEST_LOGIN_ADDR = "192.168.5.6:13000";
+	String APPLICATION_TEST_LOGIN_ADDR = "192.168.5.14:13000";
 
 	/**
 	 * 本地登录 pord地址
 	 */
-	String APPLICATION_PROD_LOGIN_ADDR = "192.168.5.6:13000";
+	String APPLICATION_PROD_LOGIN_ADDR = "192.168.5.14:13000";
 
 
 	/**

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/controller/FactoryCommonController.java

@@ -14,14 +14,19 @@ import org.springblade.common.annotations.LocalServerUser;
 import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.core.tool.utils.WebUtil;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -178,8 +183,13 @@ public class FactoryCommonController {
 			map.put("messageData", receiveInfoDTO);
 			map.put("createTime", new Date().getTime());
 			map.put("flagType", "OrderStatusLog");
+
 			//将消息携带绑定键值
-			rabbitTemplate.convertAndSend(RabbitConstant.UNLOAD_CAR_COM_INFO_EXCHANGE, RabbitConstant.UNLOAD_CAR_COM_INFO_ROUTING, map);
+			rabbitTemplate.convertAndSend(RabbitConstant.UNLOAD_CAR_COM_INFO_EXCHANGE, RabbitConstant.UNLOAD_CAR_COM_INFO_ROUTING, map,message -> {
+				HttpServletRequest request = WebUtil.getRequest();
+				message.getMessageProperties().setHeader("Blade-Auth",request.getHeader("Blade-Auth"));
+				return message;
+			});
 
 			return R.success("调用成功");
 		} catch (CustomerException e) {

blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/LocalServerLoginAccountsInterceptor.java

@@ -43,7 +43,7 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt
 
 
 		try {
-			JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER);
+			JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+"admin");
 			CustomHttpServletRequestWrapper wrappedRequest = new CustomHttpServletRequestWrapper(request);
 			if(Objects.isNull(data)){
 				String url = "http://"+ LauncherConstant.loginAddr(AppConstant.DEV_CODE)+"/blade-auth/oauth/token";
@@ -59,7 +59,7 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt
 				HttpResponse execute = urlRequest.form(params).execute();
 				String body = execute.body();
 				data = JSONObject.parseObject(body);
-				bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER,data,3200L);
+				bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+"admin",data,3200L);
 			}
 
 			// 修改或添加header

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.java

@@ -1,5 +1,6 @@
 package com.logpm.factory.mt.mapper;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.factory.mt.entity.MtFactoryOrderMain;