Browse Source

Merge pull request 'top新增from' (#150) from KingChan/forgeplus:chenjing into standalone_develop

pull/338/head
KingChan 2 years ago
parent
commit
3cfcd1a671
5 changed files with 13 additions and 6 deletions
  1. +5
    -2
      app/models/topic.rb
  2. +2
    -1
      app/views/topics/_activity_forum.json.jbuilder
  3. +2
    -1
      app/views/topics/_experience_forum.json.jbuilder
  4. +2
    -1
      app/views/topics/_glcc_news.json.jbuilder
  5. +2
    -1
      app/views/topics/_pinned_forum.json.jbuilder

+ 5
- 2
app/models/topic.rb View File

@@ -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


+ 2
- 1
app/views/topics/_activity_forum.json.jbuilder View File

@@ -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]
json.created_time data[:created_time]
json.from data[:from]

+ 2
- 1
app/views/topics/_experience_forum.json.jbuilder View File

@@ -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]
json.created_time data[:created_time]
json.from data[:from]

+ 2
- 1
app/views/topics/_glcc_news.json.jbuilder View File

@@ -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]
json.created_time data[:created_time]
json.from data[:from]

+ 2
- 1
app/views/topics/_pinned_forum.json.jbuilder View File

@@ -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]
json.created_time data[:created_time]
json.from data[:from]

Loading…
Cancel
Save