From 52b8850170d5f20ef79312f2c08b94b604f44bd0 Mon Sep 17 00:00:00 2001 From: gaoyutao Date: Mon, 24 Nov 2025 18:30:40 +0800 Subject: [PATCH] =?UTF-8?q?mtr=E7=9B=91=E6=8E=A7=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 46 +++++++++++++++++++ .../agent/server/core/enums/MsgEnum.java | 2 + .../server/netty/enpoint/AgentEndpoint.java | 14 ++++++ .../listener/AgentConsumerDownListener.java | 2 +- src/main/resources/application-dev.yml | 6 +-- src/main/resources/application.yml | 8 ++-- 6 files changed, 70 insertions(+), 8 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..09bdfea --- /dev/null +++ b/.gitignore @@ -0,0 +1,46 @@ +###################################################################### +# Build Tools + +.gradle +/build/ +!gradle/wrapper/gradle-wrapper.jar + +target/ +!.mvn/wrapper/maven-wrapper.jar + +###################################################################### +# IDE + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### JRebel ### +rebel.xml +### NetBeans ### +nbproject/private/ +build/* +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ + +###################################################################### +# Others +*.log +*.xml.versionsBackup +*.swp + +!*/build/*.java +!*/build/*.html +!*/build/*.xml \ No newline at end of file diff --git a/src/main/java/com/tongran/agent/server/core/enums/MsgEnum.java b/src/main/java/com/tongran/agent/server/core/enums/MsgEnum.java index 1bbb9d7..2f8fade 100644 --- a/src/main/java/com/tongran/agent/server/core/enums/MsgEnum.java +++ b/src/main/java/com/tongran/agent/server/core/enums/MsgEnum.java @@ -77,6 +77,8 @@ public enum MsgEnum { Agent版本更新应答("AGENT_VERSION_UPDATE_RSP"), + MTR探测上报("MTR_DETECT"), + 多网IP探测上报("NETWORK_DETECT"); private String value; diff --git a/src/main/java/com/tongran/agent/server/netty/enpoint/AgentEndpoint.java b/src/main/java/com/tongran/agent/server/netty/enpoint/AgentEndpoint.java index ea5b04b..ac58d23 100644 --- a/src/main/java/com/tongran/agent/server/netty/enpoint/AgentEndpoint.java +++ b/src/main/java/com/tongran/agent/server/netty/enpoint/AgentEndpoint.java @@ -414,6 +414,20 @@ public class AgentEndpoint { } } + @AgentDispatcher(msgId = MsgEnum.MTR探测上报) + public class DetectMtrHandler implements AgentHandler { + @Override + public UpMsgResponse upHandle(String data, String clientId) { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("clientId", clientId); + jsonObject.put("dataType", MsgEnum.MTR探测上报.getValue()); + jsonObject.put("data", data); + MqMsg mqMsg = MqMsg.builder().topic(agentMqConfig.getAgentTopic()).content(jsonObject.toString()).build(); + agentProducer.asyncSend(mqMsg); + return null; + } + } + diff --git a/src/main/java/com/tongran/agent/server/rockermq/listener/AgentConsumerDownListener.java b/src/main/java/com/tongran/agent/server/rockermq/listener/AgentConsumerDownListener.java index 3674d32..85d9b91 100644 --- a/src/main/java/com/tongran/agent/server/rockermq/listener/AgentConsumerDownListener.java +++ b/src/main/java/com/tongran/agent/server/rockermq/listener/AgentConsumerDownListener.java @@ -18,7 +18,7 @@ import java.util.Objects; @Component @ConditionalOnProperty(name = "rocketmq.enabled", havingValue = "true") -@RocketMQMessageListener(topic = "tr_agent_down", consumerGroup = "tr_agent_down_group") +@RocketMQMessageListener(topic = "tr_mtragent_down", consumerGroup = "tr_mtragent_down_group") public class AgentConsumerDownListener implements RocketMQListener { protected final SessionManager sessionManager; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 4f8ca1f..9d34ba7 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -12,11 +12,11 @@ knife4j: logging: file: # path: /usr/local/tongran/logs - path: /usr/local/tongran_server/logs + path: /usr/local/tongran_mtrserver/logs # path: D:/job/agent-logs/logs rocketmq: - name-server: 172.16.15.103:9876 + name-server: 172.16.15.52:9876 enabled: true tcp: @@ -24,6 +24,6 @@ tcp: charge: enable: true name: AGENT-SERVER-服务 - port: 6620 + port: 6610 readerIdleTime: 300 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b504121..adeda53 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -34,10 +34,10 @@ rocketmq: producer: group: tongran-group topic: default_topic - agent-group: tr_agent_up_group - agent-topic: tr_agent_up + agent-group: tr_mtragent_up_group + agent-topic: tr_mtragent_up consumer: group: tongran-group topic: default_topic - agent-group: tr_agent_down_group - agent-topic: tr_agent_down \ No newline at end of file + agent-group: tr_mtragent_down_group + agent-topic: tr_mtragent_down \ No newline at end of file