From caef8cb38146f10d07e60dbcfb43ff03e866e960 Mon Sep 17 00:00:00 2001
From: DDDHuang <44492639+DDDHuang@users.noreply.github.com>
Date: Tue, 31 Aug 2021 10:24:17 +0800
Subject: [PATCH] fix: retainer message format time by rfc3339 (#5607)

* fix: retainer message format time by rfc3339
---
 apps/emqx_retainer/src/emqx_retainer_api.erl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/emqx_retainer/src/emqx_retainer_api.erl b/apps/emqx_retainer/src/emqx_retainer_api.erl
index 313ae9b02..503827d4b 100644
--- a/apps/emqx_retainer/src/emqx_retainer_api.erl
+++ b/apps/emqx_retainer/src/emqx_retainer_api.erl
@@ -46,9 +46,9 @@ message_props() ->
         {topic, string, <<"MQTT Topic">>},
         {qos, string, <<"MQTT QoS">>},
         {payload, string, <<"MQTT Payload">>},
-        {publish_at, string, <<"publish datetime">>},
-        {from_clientid, string, <<"publisher ClientId">>},
-        {from_username, string, <<"publisher Username">>}
+        {publish_at, string, <<"Publish datetime, in RFC 3339 format">>},
+        {from_clientid, string, <<"Publisher ClientId">>},
+        {from_username, string, <<"Publisher Username">>}
     ]).
 
 parameters() ->
@@ -170,7 +170,7 @@ format_message(#message{id = ID, qos = Qos, topic = Topic, from = From, timestam
     #{msgid => emqx_guid:to_hexstr(ID),
       qos => Qos,
       topic => Topic,
-      publish_at => erlang:list_to_binary(emqx_mgmt_util:strftime(Timestamp div 1000)),
+      publish_at => list_to_binary(calendar:system_time_to_rfc3339(Timestamp, [{unit, millisecond}])),
       from_clientid => to_bin_string(From),
       from_username => maps:get(username, Headers, <<>>)
      }.