From f0710d34c72c5068c99e1e7da7870426d5796ba5 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 12 Jul 2024 23:31:11 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0elk=20=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/LauncherConstant.java | 34 +++++++++++++++++++ .../common/launch/LauncherServiceImpl.java | 2 ++ .../factory/receiver/UnloadCarComHandler.java | 8 +++-- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index cfce22cc1..149f15f06 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -105,6 +105,23 @@ public interface LauncherConstant { String APPLICATION_PROD_LOGIN_ADDR = "172.16.128.147:8888"; + /** + * elk dev 地址 + */ + + String ELK_DEV_ADDR = "192.168.2.46:9000"; + + /** + * elk prod 地址 + */ + String ELK_PROD_ADDR = "172.30.0.72:9000"; + + /** + * elk test 地址 + */ + String ELK_TEST_ADDR = "192.168.2.110:9002"; + + /** * dbuuo提供者 */ @@ -246,4 +263,21 @@ public interface LauncherConstant { } } + /** + * 动态获取elk地址 + * + * @param profile 环境变量 + * @return addr + */ + static String elkAddr(String profile) { + switch (profile) { + case (AppConstant.PROD_CODE): + return ELK_PROD_ADDR; + case (AppConstant.TEST_CODE): + return ELK_TEST_ADDR; + default: + return ELK_DEV_ADDR; + } + } + } diff --git a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java index eb7a75c87..485bc9ce4 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java +++ b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java @@ -40,6 +40,8 @@ public class LauncherServiceImpl implements LauncherService { PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.server-addr", LauncherConstant.nacosAddr(profile)); PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile)); + // 开启elk日志 + PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile)); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java index 689eb2baf..46f4e7881 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java @@ -14,6 +14,8 @@ import com.logpm.oldproject.feign.IAdvanceDetailClient; import com.rabbitmq.client.Channel; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.RabbitConstant; +import org.springblade.core.log.feign.ILogClient; +import org.springblade.core.log.model.LogError; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.StringUtil; import org.springframework.amqp.core.Message; @@ -51,6 +53,8 @@ public class UnloadCarComHandler { @Autowired private IMtPushDataService mtPushDataService; + private ILogClient logClient; + @RabbitHandler public void unloadCarComDataHandler(Map map, Message message, Channel channel) { @@ -99,14 +103,14 @@ public class UnloadCarComHandler { r.add(carNum); } } - r.forEach(t->{ sendDataCarNum(t, unloadCarDTO.getCompleteDate()); }); - } catch (Exception e) { log.error("##################unloadCarComDataHandler 解析数据出错：{}", e.getMessage()); + + }