diff --git a/app/models/topic.rb b/app/models/topic.rb index be6d151d9..163c2afdd 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -45,19 +45,22 @@ class Topic < ApplicationRecord def get_visitor_data data = { visits: 0, - created_time: format_time(Time.now) + created_time: format_time(Time.now), + from:"other" } if self.url.include?("gitlink.org.cn/forums/") || self.url.include?("trustie.net/forums/") request_memo = Forum::Memos::GetService.call(self.uuid) data[:visits] = request_memo.nil? ? 0 : request_memo["memo"]["viewed_count"] - data[:created_time] = request_memo.nil? ? format_time(Time.now) : request_memo["memo"]["published_time"] + data[:created_time] = request_memo.nil? ? format_time(Time.now) : request_memo["memo"]["published_time"] + data[:from] = "forums" end if self.url.include?("gitlink.org.cn/zone/") || self.url.include?("trustie.net/zone/") request_doc = Getway::Cms::GetService.call(self.uuid) data[:visits] = request_doc.nil? ? 0 : request_doc["data"]["visits"] data[:created_time] = request_doc.nil? ? format_time(Time.now) : request_doc["data"]["publishTime"] + data[:from] = "zone" end data diff --git a/app/views/topics/_activity_forum.json.jbuilder b/app/views/topics/_activity_forum.json.jbuilder index bb672dff1..c1d81f87c 100644 --- a/app/views/topics/_activity_forum.json.jbuilder +++ b/app/views/topics/_activity_forum.json.jbuilder @@ -1,4 +1,5 @@ json.(activity_forum, :id, :title, :url) data = activity_forum.get_visitor_data json.visits data[:visits] -json.created_time data[:created_time] \ No newline at end of file +json.created_time data[:created_time] +json.from data[:from] \ No newline at end of file diff --git a/app/views/topics/_experience_forum.json.jbuilder b/app/views/topics/_experience_forum.json.jbuilder index 46f20eeeb..414990236 100644 --- a/app/views/topics/_experience_forum.json.jbuilder +++ b/app/views/topics/_experience_forum.json.jbuilder @@ -1,4 +1,5 @@ json.(experience_forum, :id, :title, :url) data = experience_forum.get_visitor_data json.visits data[:visits] -json.created_time data[:created_time] \ No newline at end of file +json.created_time data[:created_time] +json.from data[:from] \ No newline at end of file diff --git a/app/views/topics/_glcc_news.json.jbuilder b/app/views/topics/_glcc_news.json.jbuilder index 64c392ee0..6c1227429 100644 --- a/app/views/topics/_glcc_news.json.jbuilder +++ b/app/views/topics/_glcc_news.json.jbuilder @@ -1,4 +1,5 @@ json.(glcc_news, :id, :title, :url, :uuid) data = glcc_news.get_visitor_data json.visits data[:visits] -json.created_time data[:created_time] \ No newline at end of file +json.created_time data[:created_time] +json.from data[:from] \ No newline at end of file diff --git a/app/views/topics/_pinned_forum.json.jbuilder b/app/views/topics/_pinned_forum.json.jbuilder index a543fba5f..db250e55c 100644 --- a/app/views/topics/_pinned_forum.json.jbuilder +++ b/app/views/topics/_pinned_forum.json.jbuilder @@ -1,4 +1,5 @@ json.(pinned_forum, :id, :title, :url) data = pinned_forum.get_visitor_data json.visits data[:visits] -json.created_time data[:created_time] \ No newline at end of file +json.created_time data[:created_time] +json.from data[:from] \ No newline at end of file