Merge branch 'dev' into pre-production

blade-service/logpm-factory-data/logpm-factory-data-base/src/main/java/com/logpm/factorydata/base/service/impl/MqServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONConfig;
 import cn.hutool.json.JSONUtil;
 import com.logpm.factorydata.base.constant.MqConstants;
 import com.logpm.factorydata.base.entity.FailMsgEntity;
@@ -57,7 +58,8 @@ public class MqServiceImpl implements MqService {
 	@Override
 	public Boolean sendMsg(String exchange, String routingKey, Object msg, int delay) {
 		// 1.获取消息内容，如果非字符串将其序列化
-		String jsonMsg = (msg instanceof String) ? (String) msg : JSONUtil.toJsonStr(msg);
+		JSONConfig jsonConfig = JSONConfig.create().setDateFormat("yyyy-MM-dd HH:mm:ss");
+		String jsonMsg = (msg instanceof String) ? (String) msg : JSONUtil.toJsonStr(msg,jsonConfig);
 		String msgId = IdUtil.simpleUUID();
 		log.info("消息发送！exchange = {}, routingKey = {}, msg = {}, msgId = {}", exchange, routingKey, jsonMsg, msgId);
 		// 2.全局唯一的消息ID，需要封装到CorrelationData中