From 3367d748b66a92d21ef2968ceb75effb385e7f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Wed, 27 Sep 2023 09:29:50 +0800 Subject: [PATCH 1/9] add setting navbar index --- .../admins/laboratory_settings_controller.rb | 2 +- app/controllers/settings_controller.rb | 2 +- .../admins/save_laboratory_setting_service.rb | 1 + app/views/admins/laboratory_settings/show.html.erb | 14 ++++++++------ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/controllers/admins/laboratory_settings_controller.rb b/app/controllers/admins/laboratory_settings_controller.rb index 861db50c6..d522a479b 100644 --- a/app/controllers/admins/laboratory_settings_controller.rb +++ b/app/controllers/admins/laboratory_settings_controller.rb @@ -25,6 +25,6 @@ class Admins::LaboratorySettingsController < Admins::BaseController params.permit(:identifier, :name, :nav_logo, :login_logo, :tab_logo, :oj_banner, :subject_banner, :course_banner, :competition_banner, :moop_cases_banner, - :footer, navbar: %i[name link hidden]) + :footer, navbar: %i[name link hidden index]) end end \ No newline at end of file diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index 92a4afd21..029f9cf29 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -28,7 +28,7 @@ class SettingsController < ApplicationController private def get_navbar - @navbar = default_laboratory.navbar + @navbar = default_laboratory.navbar.sort_by{|e| e["index"]} # if User.current.logged? # pernal_index = {"name"=>"个人主页", "link"=>get_site_url("url", "#{Rails.application.config_for(:configuration)['platform_url']}/current_user"), "hidden"=>false} # @navbar << pernal_index diff --git a/app/services/admins/save_laboratory_setting_service.rb b/app/services/admins/save_laboratory_setting_service.rb index c29e374bd..ad040585f 100644 --- a/app/services/admins/save_laboratory_setting_service.rb +++ b/app/services/admins/save_laboratory_setting_service.rb @@ -30,6 +30,7 @@ class Admins::SaveLaboratorySettingService < ApplicationService hash = {} hash[:name] = strip nav[:name] hash[:link] = strip nav[:link] + hash[:index] = strip nav[:index] hash[:hidden] = nav[:hidden].to_s != '0' hash end diff --git a/app/views/admins/laboratory_settings/show.html.erb b/app/views/admins/laboratory_settings/show.html.erb index 8cf2d4cbf..d3d3002bf 100644 --- a/app/views/admins/laboratory_settings/show.html.erb +++ b/app/views/admins/laboratory_settings/show.html.erb @@ -16,9 +16,9 @@ https:// <%= text_field_tag :identifier, @laboratory.identifier, - maxlength: 15, class: 'form-control font-16', - 'onKeyUp': 'value=value.replace(/[^\w\-\/]/ig,"").toLowerCase()', - style: 'text-transform:lowercase'%> + maxlength: 15, class: 'form-control font-16', + 'onKeyUp': 'value=value.replace(/[^\w\-\/]/ig,"").toLowerCase()', + style: 'text-transform:lowercase'%>
<% rails_env = EduSetting.get('rails_env') %> <%= rails_env && rails_env != 'production' ? ".#{rails_env}.gitlink.org.cn" : '.gitlink.org.cn' %> @@ -159,15 +159,17 @@ 导航名称 导航链接 - 是否展示 + 顺序 + 是否展示 操作 - - <% (setting.navbar || setting.default_navbar).each do |nav| %> + + <% (setting.navbar || setting.default_navbar).sort_by{|e| e["index"]}.each do |nav| %> <%= text_field_tag('navbar[][name]', nav['name'], id: nil, class: 'form-control') %> <%= text_field_tag('navbar[][link]', nav['link'], id: nil, class: 'form-control') %> + <%= text_field_tag('navbar[][index]', nav['index'], id: nil, class: 'form-control') %> <%= check_box_tag('navbar[][hidden]', 0, !nav['hidden'], id: nil, class: 'font-16') %> From 19c8587723632bedf9ae9c9e4e7f228fde259366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Wed, 27 Sep 2023 09:43:35 +0800 Subject: [PATCH 2/9] add setting navbar index for new --- app/controllers/settings_controller.rb | 2 +- app/views/admins/laboratory_settings/_add_tr.html.erb | 1 + app/views/admins/laboratory_settings/show.html.erb | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index 029f9cf29..c95ad0bcd 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -28,7 +28,7 @@ class SettingsController < ApplicationController private def get_navbar - @navbar = default_laboratory.navbar.sort_by{|e| e["index"]} + @navbar = default_laboratory.navbar.sort_by{|e| e["index"].to_i } # if User.current.logged? # pernal_index = {"name"=>"个人主页", "link"=>get_site_url("url", "#{Rails.application.config_for(:configuration)['platform_url']}/current_user"), "hidden"=>false} # @navbar << pernal_index diff --git a/app/views/admins/laboratory_settings/_add_tr.html.erb b/app/views/admins/laboratory_settings/_add_tr.html.erb index 2d6ff25d5..d80419fa0 100644 --- a/app/views/admins/laboratory_settings/_add_tr.html.erb +++ b/app/views/admins/laboratory_settings/_add_tr.html.erb @@ -1,6 +1,7 @@ <%= text_field_tag('navbar[][name]', "", id: nil, class: 'form-control', placeholder: "导航名称") %> <%= text_field_tag('navbar[][link]', "", id: nil, class: 'form-control', placeholder: "导航链接") %> + <%= number_field_tag('navbar[][index]', "", id: nil, class: 'form-control', placeholder: "顺序") %> <%= check_box_tag('navbar[][hidden]', 0, false, id: nil, class: 'font-16') %> diff --git a/app/views/admins/laboratory_settings/show.html.erb b/app/views/admins/laboratory_settings/show.html.erb index d3d3002bf..088c281cb 100644 --- a/app/views/admins/laboratory_settings/show.html.erb +++ b/app/views/admins/laboratory_settings/show.html.erb @@ -165,11 +165,11 @@ - <% (setting.navbar || setting.default_navbar).sort_by{|e| e["index"]}.each do |nav| %> + <% (setting.navbar || setting.default_navbar).sort_by{|e| e["index"].to_i }.each do |nav| %> <%= text_field_tag('navbar[][name]', nav['name'], id: nil, class: 'form-control') %> <%= text_field_tag('navbar[][link]', nav['link'], id: nil, class: 'form-control') %> - <%= text_field_tag('navbar[][index]', nav['index'], id: nil, class: 'form-control') %> + <%= number_field_tag('navbar[][index]', nav['index'], id: nil, class: 'form-control') %> <%= check_box_tag('navbar[][hidden]', 0, !nav['hidden'], id: nil, class: 'font-16') %> From b080b8fca564ade601c618c1254c25f1ee41f1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Wed, 27 Sep 2023 10:28:33 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=9D=A1index=E7=9A=84=E8=BE=93=E5=85=A5=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admins/laboratory_settings/_add_tr.html.erb | 2 +- app/views/admins/laboratory_settings/show.html.erb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/admins/laboratory_settings/_add_tr.html.erb b/app/views/admins/laboratory_settings/_add_tr.html.erb index d80419fa0..91e252d55 100644 --- a/app/views/admins/laboratory_settings/_add_tr.html.erb +++ b/app/views/admins/laboratory_settings/_add_tr.html.erb @@ -1,7 +1,7 @@ <%= text_field_tag('navbar[][name]', "", id: nil, class: 'form-control', placeholder: "导航名称") %> <%= text_field_tag('navbar[][link]', "", id: nil, class: 'form-control', placeholder: "导航链接") %> - <%= number_field_tag('navbar[][index]', "", id: nil, class: 'form-control', placeholder: "顺序") %> + <%= number_field_tag('navbar[][index]', "1", id: nil, class: 'form-control',min:0, max:99999, placeholder: "顺序", title:"请输入正整数 范围 0-99999", pattern:'^\d+')%> <%= check_box_tag('navbar[][hidden]', 0, false, id: nil, class: 'font-16') %> diff --git a/app/views/admins/laboratory_settings/show.html.erb b/app/views/admins/laboratory_settings/show.html.erb index 088c281cb..df1db4fad 100644 --- a/app/views/admins/laboratory_settings/show.html.erb +++ b/app/views/admins/laboratory_settings/show.html.erb @@ -158,8 +158,8 @@ 导航名称 - 导航链接 - 顺序 + 导航链接 + 顺序 是否展示 操作 @@ -169,7 +169,7 @@ <%= text_field_tag('navbar[][name]', nav['name'], id: nil, class: 'form-control') %> <%= text_field_tag('navbar[][link]', nav['link'], id: nil, class: 'form-control') %> - <%= number_field_tag('navbar[][index]', nav['index'], id: nil, class: 'form-control') %> + <%= number_field_tag('navbar[][index]', nav['index'].to_i, id: nil, class: 'form-control',min:0,max:99999, title:"请输入正整数 范围 0-99999", pattern:'^\d+')%> <%= check_box_tag('navbar[][hidden]', 0, !nav['hidden'], id: nil, class: 'font-16') %> From 9d5c5acfbf821e059d3ff9e1dcdcfae99677eea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Wed, 27 Sep 2023 14:12:03 +0800 Subject: [PATCH 4/9] getway lib --- app/libs/getway.rb | 20 ++++ app/models/topic.rb | 27 +++++- app/services/getway/client_service.rb | 94 +++++++++++++++++++ app/services/getway/cms/get_service.rb | 21 +++++ .../topics/_activity_forum.json.jbuilder | 6 +- .../topics/_experience_forum.json.jbuilder | 5 +- app/views/topics/_glcc_news.json.jbuilder | 5 +- app/views/topics/_pinned_forum.json.jbuilder | 5 +- 8 files changed, 169 insertions(+), 14 deletions(-) create mode 100644 app/libs/getway.rb create mode 100644 app/services/getway/client_service.rb create mode 100644 app/services/getway/cms/get_service.rb diff --git a/app/libs/getway.rb b/app/libs/getway.rb new file mode 100644 index 000000000..0b876b839 --- /dev/null +++ b/app/libs/getway.rb @@ -0,0 +1,20 @@ +module Getway + class << self + def getway_config + getway_config = {} + + begin + config = Rails.application.config_for(:configuration).symbolize_keys! + getway_config = config[:getway].symbolize_keys! + raise 'getway config missing' if getway_config.blank? + rescue => ex + raise ex if Rails.env.production? + + puts %Q{\033[33m [warning] getway config or configuration.yml missing, + please add it or execute 'cp config/configuration.yml.example config/configuration.yml' \033[0m} + getway_config = {} + end + getway_config + end + end +end diff --git a/app/models/topic.rb b/app/models/topic.rb index f7b4a11fb..b64fb5340 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -41,11 +41,34 @@ class Topic < ApplicationRecord end end + + def get_visitor_data + data = { + visits: 0, + created_time: format_time(Time.now) + } + + if self.url.include?("gitlink.org.cn/forums/") || self.url.include?("trustie.net/forums/") + request_memo = Forum::Memos::GetService.call(self.uuid) + binding.pry + 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"] + 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"] + end + + data + end + private def image_url(type) - return nil unless Util::FileManage.exists?(self, type) - Util::FileManage.source_disk_file_url(self, type) + return nil unless Util::FileManage.exists?(self, type) + Util::FileManage.source_disk_file_url(self, type) end end diff --git a/app/services/getway/client_service.rb b/app/services/getway/client_service.rb new file mode 100644 index 000000000..cd774772e --- /dev/null +++ b/app/services/getway/client_service.rb @@ -0,0 +1,94 @@ +class Getway::ClientService < ApplicationService + attr_reader :url, :params + + PAGINATE_DEFAULT_PAGE = 1 + PAGINATE_DEFAULT_LIMIT = 20 + + def initialize(options={}) + @url = options[:url] + @params = options[:params] + end + + def get(url, params={}) + conn(params).get do |req| + req.url full_url(url, 'get') + params.except(:token).each_pair do |key, value| + req.params["#{key}"] = value + end + end + + # response.headers.each do |k,v| + # puts "#{k}:#{v}" + # end #=> 响应头 + end + + private + def conn(auth={}) + @client ||= begin + Faraday.new(url: domain) do |req| + req.request :url_encoded + req.headers['Content-Type'] = 'application/json' + req.response :logger # 显示日志 + req.adapter Faraday.default_adapter + end + end + @client + end + + def base_url + Getway.getway_config[:base_url] + end + + def domain + Getway.getway_config[:domain] + end + + def api_url + [domain, base_url].join('') + end + + def full_url(api_rest, action='post') + url = [api_url, api_rest].join('').freeze + url = action === 'get' ? url : URI.escape(url) + url = URI.escape(url) unless url.ascii_only? + puts "[getway] request url: #{url}" + return url + end + + def render_response(response) + status = response.status + body = response&.body + + # log_error(status, body) + + body, message = get_body_by_status(status, body) + + [status, message, body] + end + + def get_body_by_status(status, body) + body, message = + case status + when 401 then [nil, "401"] + when 404 then [nil, "404"] + when 403 then [nil, "403"] + when 500 then [nil, "500"] + else + if body.present? + body = JSON.parse(body) + fix_body(body) + else + nil + end + end + + [body, message] + end + + def fix_body(body) + return [body, nil] if body.is_a?(Array) || body.is_a?(Hash) + + body['message'].blank? ? [body, nil] : [nil, body['message']] + end + +end diff --git a/app/services/getway/cms/get_service.rb b/app/services/getway/cms/get_service.rb new file mode 100644 index 000000000..6b7050e84 --- /dev/null +++ b/app/services/getway/cms/get_service.rb @@ -0,0 +1,21 @@ +class Getway::Cms::GetService < Getway::ClientService + attr_reader :doc_id + + def initialize(doc_id) + @doc_id = doc_id + end + + def call + response = get(url) + code, message, body = render_response(response) + if code == 200 && body["code"] == 200 + return body + else + return nil + end + end + + def url + "/cms/doc/open/#{doc_id}".freeze + end +end \ No newline at end of file diff --git a/app/views/topics/_activity_forum.json.jbuilder b/app/views/topics/_activity_forum.json.jbuilder index cd624ba76..89a22a6cf 100644 --- a/app/views/topics/_activity_forum.json.jbuilder +++ b/app/views/topics/_activity_forum.json.jbuilder @@ -1,4 +1,4 @@ json.(activity_forum, :id, :title, :url) -request_memo = Forum::Memos::GetService.call(activity_forum&.uuid) -json.visits request_memo.nil? ? 0 : request_memo["memo"]["viewed_count"] -json.created_time request_memo.nil? ? format_time(Time.now) : request_memo["memo"]["published_time"] \ No newline at end of file + +json.visits activity_forum.get_visitor_data[:visits] +json.created_time activity_forum.get_visitor_data[:visits] \ 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 c65a00ef8..347b746bd 100644 --- a/app/views/topics/_experience_forum.json.jbuilder +++ b/app/views/topics/_experience_forum.json.jbuilder @@ -1,4 +1,3 @@ json.(experience_forum, :id, :title, :url) -request_memo = Forum::Memos::GetService.call(experience_forum&.uuid) -json.visits request_memo.nil? ? 0 : request_memo["memo"]["viewed_count"] -json.created_time request_memo.nil? ? format_time(Time.now) : request_memo["memo"]["published_time"] \ No newline at end of file +json.visits experience_forum.get_visitor_data[:visits] +json.created_time experience_forum.get_visitor_data[:visits] \ 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 0147aff3f..ca877d4d1 100644 --- a/app/views/topics/_glcc_news.json.jbuilder +++ b/app/views/topics/_glcc_news.json.jbuilder @@ -1,4 +1,3 @@ json.(glcc_news, :id, :title, :url, :uuid) -request_memo = Forum::Memos::GetService.call(glcc_news&.uuid) -json.visits request_memo.nil? ? 0 : request_memo["memo"]["viewed_count"] -json.created_time request_memo.nil? ? format_time(Time.now) : request_memo["memo"]["published_time"] \ No newline at end of file +json.visits glcc_news.get_visitor_data[:visits] +json.created_time glcc_news.get_visitor_data[:visits] \ 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 3d5adce26..760db221b 100644 --- a/app/views/topics/_pinned_forum.json.jbuilder +++ b/app/views/topics/_pinned_forum.json.jbuilder @@ -1,4 +1,3 @@ json.(pinned_forum, :id, :title, :url) -request_memo = Forum::Memos::GetService.call(pinned_forum&.uuid) -json.visits request_memo.nil? ? 0 : request_memo["memo"]["viewed_count"] -json.created_time request_memo.nil? ? format_time(Time.now) : request_memo["memo"]["published_time"] \ No newline at end of file +json.visits pinned_forum.get_visitor_data[:visits] +json.created_time pinned_forum.get_visitor_data[:visits] \ No newline at end of file From 272b73fa0a787238469918e6a08b8dceca487752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Wed, 27 Sep 2023 14:16:13 +0800 Subject: [PATCH 5/9] update --- app/models/topic.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index b64fb5340..be6d151d9 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -50,7 +50,6 @@ class Topic < ApplicationRecord if self.url.include?("gitlink.org.cn/forums/") || self.url.include?("trustie.net/forums/") request_memo = Forum::Memos::GetService.call(self.uuid) - binding.pry 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"] end From 5592855996bf95b36238fe276aed59d35b406250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Wed, 27 Sep 2023 15:11:09 +0800 Subject: [PATCH 6/9] fix topic data --- app/views/topics/_activity_forum.json.jbuilder | 6 +++--- app/views/topics/_experience_forum.json.jbuilder | 5 +++-- app/views/topics/_glcc_news.json.jbuilder | 5 +++-- app/views/topics/_pinned_forum.json.jbuilder | 5 +++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/views/topics/_activity_forum.json.jbuilder b/app/views/topics/_activity_forum.json.jbuilder index 89a22a6cf..bb672dff1 100644 --- a/app/views/topics/_activity_forum.json.jbuilder +++ b/app/views/topics/_activity_forum.json.jbuilder @@ -1,4 +1,4 @@ json.(activity_forum, :id, :title, :url) - -json.visits activity_forum.get_visitor_data[:visits] -json.created_time activity_forum.get_visitor_data[:visits] \ No newline at end of file +data = activity_forum.get_visitor_data +json.visits data[:visits] +json.created_time data[:created_time] \ 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 347b746bd..46f20eeeb 100644 --- a/app/views/topics/_experience_forum.json.jbuilder +++ b/app/views/topics/_experience_forum.json.jbuilder @@ -1,3 +1,4 @@ json.(experience_forum, :id, :title, :url) -json.visits experience_forum.get_visitor_data[:visits] -json.created_time experience_forum.get_visitor_data[:visits] \ No newline at end of file +data = experience_forum.get_visitor_data +json.visits data[:visits] +json.created_time data[:created_time] \ 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 ca877d4d1..64c392ee0 100644 --- a/app/views/topics/_glcc_news.json.jbuilder +++ b/app/views/topics/_glcc_news.json.jbuilder @@ -1,3 +1,4 @@ json.(glcc_news, :id, :title, :url, :uuid) -json.visits glcc_news.get_visitor_data[:visits] -json.created_time glcc_news.get_visitor_data[:visits] \ No newline at end of file +data = glcc_news.get_visitor_data +json.visits data[:visits] +json.created_time data[:created_time] \ 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 760db221b..a543fba5f 100644 --- a/app/views/topics/_pinned_forum.json.jbuilder +++ b/app/views/topics/_pinned_forum.json.jbuilder @@ -1,3 +1,4 @@ json.(pinned_forum, :id, :title, :url) -json.visits pinned_forum.get_visitor_data[:visits] -json.created_time pinned_forum.get_visitor_data[:visits] \ No newline at end of file +data = pinned_forum.get_visitor_data +json.visits data[:visits] +json.created_time data[:created_time] \ No newline at end of file From e1808e0689830884807268bde086bacdd44d2114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Wed, 27 Sep 2023 15:53:56 +0800 Subject: [PATCH 7/9] add topic from --- app/models/topic.rb | 7 +++++-- app/views/topics/_activity_forum.json.jbuilder | 3 ++- app/views/topics/_experience_forum.json.jbuilder | 3 ++- app/views/topics/_glcc_news.json.jbuilder | 3 ++- app/views/topics/_pinned_forum.json.jbuilder | 3 ++- 5 files changed, 13 insertions(+), 6 deletions(-) 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 From b7d6be8b9fdd6a0bde42d05a4e523861736db1f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Wed, 27 Sep 2023 16:59:33 +0800 Subject: [PATCH 8/9] add issue search project_issues_index --- app/services/issues/list_query_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/issues/list_query_service.rb b/app/services/issues/list_query_service.rb index f7c23ddfd..89081ab13 100644 --- a/app/services/issues/list_query_service.rb +++ b/app/services/issues/list_query_service.rb @@ -33,7 +33,7 @@ class Issues::ListQueryService < ApplicationService end if search_name.present? - issues = issues.where("issues.subject LIKE ? OR issues.description LIKE ? ", "%#{search_name}%", "%#{search_name}%") + issues = issues.where("issues.subject LIKE ? OR issues.description OR issues.project_issues_index LIKE ? ", "%#{search_name}%", "%#{search_name}%") end if start_time&.present? || end_time&.present? From cef99e90b3c6be491fad3d35e4cfe9ce8ca68b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Thu, 28 Sep 2023 09:25:51 +0800 Subject: [PATCH 9/9] Revert "add issue search project_issues_index" This reverts commit b7d6be8b9fdd6a0bde42d05a4e523861736db1f0. --- app/services/issues/list_query_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/issues/list_query_service.rb b/app/services/issues/list_query_service.rb index 89081ab13..f7c23ddfd 100644 --- a/app/services/issues/list_query_service.rb +++ b/app/services/issues/list_query_service.rb @@ -33,7 +33,7 @@ class Issues::ListQueryService < ApplicationService end if search_name.present? - issues = issues.where("issues.subject LIKE ? OR issues.description OR issues.project_issues_index LIKE ? ", "%#{search_name}%", "%#{search_name}%") + issues = issues.where("issues.subject LIKE ? OR issues.description LIKE ? ", "%#{search_name}%", "%#{search_name}%") end if start_time&.present? || end_time&.present?