From c0ee0a694ceabfb920b92f10ff0ad257cb1ba4e4 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 15 Aug 2022 15:55:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=BA=AF=E6=BA=90status=E6=94=B9=E4=B8=BAcode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/traces/base_controller.rb | 26 +++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 app/controllers/traces/base_controller.rb

diff --git a/app/controllers/traces/base_controller.rb b/app/controllers/traces/base_controller.rb
new file mode 100644
index 000000000..30970a5b8
--- /dev/null
+++ b/app/controllers/traces/base_controller.rb
@@ -0,0 +1,26 @@
+class Traces::BaseController < ApplicationController
+
+  helper_method :observed_logged_user?, :observed_user
+  before_action :check_trace_system
+
+  def observed_user
+    @_observed_user ||= (User.find_by_login(params[:user_id]) || User.find_by_id(params[:user_id]))
+  end
+
+  def observed_logged_user?
+    observed_user.id == User.current&.id
+  end
+
+  protected
+  def check_auth 
+    return render_forbidden unless current_user.admin? || observed_logged_user?
+  end
+
+  def check_trace_system
+    code, data, error = Trace::SystemInfoService.call(current_user.trace_token)
+    return render_ok({code: 501, data: {operate_time: data['operate_time']}, message: '系统维护中'}) if data['status'] === 0
+  rescue 
+    # 这里根据需求跳转到404
+    return render_not_found
+  end
+end
\ No newline at end of file

From 68a38e75bc597a6a45aa305694c42a31ce690b2c Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 16 Aug 2022 14:07:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8E=A5=E5=8F=A3=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/messages/_message.json.jbuilder | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/users/messages/_message.json.jbuilder b/app/views/users/messages/_message.json.jbuilder
index 075613ce9..07040dfe5 100644
--- a/app/views/users/messages/_message.json.jbuilder
+++ b/app/views/users/messages/_message.json.jbuilder
@@ -6,6 +6,7 @@ json.status message["status"]
 json.content message["content"]
 json.notification_url message["notification_url"]
 json.source message["source"]
+json.created_at message["created_at"]
 json.time_ago time_from_now(message["created_at"].to_time)
 
 case message["type"]