|
@@ -2,10 +2,10 @@ package com.xy.utils;
|
|
|
|
|
|
import cn.hutool.json.JSONObject;
|
|
|
import com.xy.config.SpringConfigs;
|
|
|
+import com.xy.dto.MqttDto;
|
|
|
import com.xy.entity.SysCodeConfigureRedis;
|
|
|
import com.xy.enums.LogEnum;
|
|
|
-import com.xy.producer.LogsProducer;
|
|
|
-import com.xy.producer.LogsProducerConfiguration;
|
|
|
+import com.xy.service.SysMqttSendService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
import org.springframework.web.context.request.RequestContextHolder;
|
|
@@ -19,7 +19,7 @@ public class LogUtils {
|
|
|
|
|
|
private static SpringConfigs springConfigs;
|
|
|
|
|
|
- private static LogsProducer logsProducer;
|
|
|
+ private static SysMqttSendService sysMqttSendService;
|
|
|
|
|
|
@Autowired(required = false)
|
|
|
public void setSpringConfigs(SpringConfigs springConfigs) {
|
|
@@ -27,8 +27,8 @@ public class LogUtils {
|
|
|
}
|
|
|
|
|
|
@Autowired(required = false)
|
|
|
- public void setMqttProducer(LogsProducer logsProducer) {
|
|
|
- LogUtils.logsProducer = logsProducer;
|
|
|
+ public void setSysMqttSendService(SysMqttSendService sysMqttSendService) {
|
|
|
+ LogUtils.sysMqttSendService = sysMqttSendService;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -64,7 +64,7 @@ public class LogUtils {
|
|
|
.set("clientIp", getIp())
|
|
|
.set("serviceName", springConfigs.getApplication().getName())
|
|
|
.set("type", "operate");
|
|
|
- logsProducer.sendToMqtt(jsonObject.toString(), LogsProducerConfiguration.TOPIC, 0);
|
|
|
+ sysMqttSendService.log(new MqttDto.RequestParams().setQos(0).setData(jsonObject.toString()));
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -86,7 +86,7 @@ public class LogUtils {
|
|
|
.set("serviceName", springConfigs.getApplication().getName())
|
|
|
.set("createTime", DataTime.getSring())
|
|
|
.set("type", "events");
|
|
|
- logsProducer.sendToMqtt(jsonObject.toString(), LogsProducerConfiguration.TOPIC, 0);
|
|
|
+ sysMqttSendService.log(new MqttDto.RequestParams().setQos(0).setData(jsonObject.toString()));
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -106,7 +106,7 @@ public class LogUtils {
|
|
|
.set("serviceName", springConfigs.getApplication().getName())
|
|
|
.set("createTime", DataTime.getSring())
|
|
|
.set("type", "tasks");
|
|
|
- logsProducer.sendToMqtt(jsonObject.toString(), LogsProducerConfiguration.TOPIC, 0);
|
|
|
+ sysMqttSendService.log(new MqttDto.RequestParams().setQos(0).setData(jsonObject.toString()));
|
|
|
}
|
|
|
|
|
|
/**
|