From ee520940de0d21dd453272bfb27cbf50c8424578 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Fri, 25 Oct 2024 16:51:26 +0800 Subject: [PATCH 01/20] =?UTF-8?q?fixed=20=E5=A2=9E=E5=8A=A0=E6=95=8F?= =?UTF-8?q?=E6=84=9F=E8=AF=8D=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chinese_dictionary.txt | 5 +++++ config/harmonious_dictionary/harmonious.hash | Bin 48789 -> 48912 bytes 2 files changed, 5 insertions(+) diff --git a/config/harmonious_dictionary/chinese_dictionary.txt b/config/harmonious_dictionary/chinese_dictionary.txt index b8a3eb177..386534f3f 100644 --- a/config/harmonious_dictionary/chinese_dictionary.txt +++ b/config/harmonious_dictionary/chinese_dictionary.txt @@ -1431,6 +1431,11 @@ Q微 永鑫娱乐 新锦江公司 福布斯客服 +福布斯 +客服热线 +红蓝注册 +上分游戏 +游戏网址 亚星正网 尊龙凯时 线上开户 diff --git a/config/harmonious_dictionary/harmonious.hash b/config/harmonious_dictionary/harmonious.hash index b3fbb0eb213ccc090bf91583a39f67fc8d97ba2f..afab436f7c7bc9e95b3e2f3934f50b1ee10342ab 100644 GIT binary patch delta 122 zcmbRGmubR3rVS^P8M!8(N^a+TF?lYVHA6@>+vLa%a+?EFq&Fl zVt4d!E-E-}&&V;^ZiC!p8x>xrxec2GHXPvqip1}foouvIg8zB*TDXSiyY_Fk+o{gP P$Ub@PPU+2cyTzFS4c9G4 delta 70 zcmV-M0J;B={sNW#0UwnP(?W{M88&Tz3m0SA+SupYCyu($}5 c*0~;&kGU9=C%F`}*0~1)lO(zyv;Vsh19{LN^Z)<= From a4f2243a7aaf9960c57a4cfabe9d8f9380a0c70f Mon Sep 17 00:00:00 2001 From: yystopf Date: Sun, 27 Oct 2024 19:58:38 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Apr=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=BF=94=E5=9B=9E=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=88=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 7 ++++--- app/views/pull_requests/index.json.jbuilder | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 442da5fab..446e3b107 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ #source 'https://gems.ruby-china.com' -source 'https://mirrors.cloud.tencent.com/rubygems/' +# source 'https://mirrors.cloud.tencent.com/rubygems/' +source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } gem 'rails', '~> 5.2.0' @@ -26,7 +27,7 @@ gem 'roo-xls' gem 'simple_xlsx_reader', '~>1.0.4' gem 'rubyzip' -gem 'sonarqube', :git => 'https://gitlink.org.cn/KingChan/sonarqube.git' +# gem 'sonarqube', :git => 'https://gitlink.org.cn/KingChan/sonarqube.git' gem 'spreadsheet' gem 'ruby-ole' # 导出为xlsx @@ -101,7 +102,7 @@ gem 'rails-i18n', '~> 5.1' # job gem 'sidekiq',"5.2.8" -gem 'sinatra' +# gem 'sinatra' gem "sidekiq-cron", "1.2.0" gem 'sidekiq-failures' diff --git a/app/views/pull_requests/index.json.jbuilder b/app/views/pull_requests/index.json.jbuilder index 9f371cb21..6b4175013 100644 --- a/app/views/pull_requests/index.json.jbuilder +++ b/app/views/pull_requests/index.json.jbuilder @@ -33,6 +33,7 @@ json.issues do json.name issue.subject json.pr_time time_from_now(pr.status == 1 ? pr.updated_at : issue.updated_on) json.pr_full_time pr.status == 1 ? pr.updated_at : issue.updated_on + json.pr_created_unix pr.created_at.to_i json.assign_user_name issue.get_assign_user.try(:show_real_name) json.assign_user_login issue.get_assign_user.try(:login) json.author_name issue.user.blank?? "已注销": issue.user.show_real_name From be4726c6a661bf57f7928efd8f52b750920457f3 Mon Sep 17 00:00:00 2001 From: yystopf Date: Sun, 27 Oct 2024 20:01:53 +0800 Subject: [PATCH 03/20] =?UTF-8?q?Gemfile=20=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 446e3b107..374dc7fc0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ #source 'https://gems.ruby-china.com' -# source 'https://mirrors.cloud.tencent.com/rubygems/' -source 'https://rubygems.org' +source 'https://mirrors.cloud.tencent.com/rubygems/' +#source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } gem 'rails', '~> 5.2.0' @@ -102,7 +102,7 @@ gem 'rails-i18n', '~> 5.1' # job gem 'sidekiq',"5.2.8" -# gem 'sinatra' +gem 'sinatra' gem "sidekiq-cron", "1.2.0" gem 'sidekiq-failures' From 2f6dda4a1511cd511b577c29632c695d8261c0d6 Mon Sep 17 00:00:00 2001 From: yystopf Date: Sun, 27 Oct 2024 20:07:43 +0800 Subject: [PATCH 04/20] =?UTF-8?q?Gemfile=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 374dc7fc0..a60a04811 100644 --- a/Gemfile +++ b/Gemfile @@ -27,7 +27,7 @@ gem 'roo-xls' gem 'simple_xlsx_reader', '~>1.0.4' gem 'rubyzip' -# gem 'sonarqube', :git => 'https://gitlink.org.cn/KingChan/sonarqube.git' +gem 'sonarqube', :git => 'https://gitlink.org.cn/KingChan/sonarqube.git' gem 'spreadsheet' gem 'ruby-ole' # 导出为xlsx From b03c1bb7a2c0c005c0e2a4a6222112633f6a51f5 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Mon, 28 Oct 2024 08:58:14 +0800 Subject: [PATCH 05/20] fixed UserAction in_threads=1 --- db/migrate/202410926031029_add_user_info_to_user_actions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/202410926031029_add_user_info_to_user_actions.rb b/db/migrate/202410926031029_add_user_info_to_user_actions.rb index 967e8a68d..608046339 100644 --- a/db/migrate/202410926031029_add_user_info_to_user_actions.rb +++ b/db/migrate/202410926031029_add_user_info_to_user_actions.rb @@ -6,7 +6,7 @@ class AddUserInfoToUserActions < ActiveRecord::Migration[5.2] add_column :user_actions, :memo, :text UserAction.find_in_batches(batch_size: 1000) do |sw| - Parallel.each(sw, in_threads: 5) do |user_action| + Parallel.each(sw, in_threads: 1) do |user_action| if user_action.user.present? user_action.login = user_action.user&.login user_action.email = user_action.user&.mail From 7392e3e3381c04c85a3bb9516952dd75aedf0c47 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 28 Oct 2024 14:26:19 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20pull=5Fcreated=5Fun?= =?UTF-8?q?ix=E5=AD=97=E6=AE=B5=E8=87=B3=E6=96=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder b/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder index a4c3c03bc..a9290d378 100644 --- a/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder +++ b/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder @@ -23,4 +23,5 @@ json.issue do end json.reviewers pull.reviewers.pluck(:login) -json.journals_count pull.journals.count \ No newline at end of file +json.journals_count pull.journals.count +json.pr_created_unix pull.created_at.to_i \ No newline at end of file From c0ebb7431ecd59d284a7e3f8cfef541dd3a4fd1a Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 28 Oct 2024 20:28:17 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=A1=B9=E7=9B=AE=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/users/projects/list_service.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/services/api/v1/users/projects/list_service.rb b/app/services/api/v1/users/projects/list_service.rb index 079d9d796..2e2716a21 100644 --- a/app/services/api/v1/users/projects/list_service.rb +++ b/app/services/api/v1/users/projects/list_service.rb @@ -1,7 +1,7 @@ class Api::V1::Users::Projects::ListService < ApplicationService include ActiveModel::Model - attr_reader :observe_user, :category, :is_public, :project_type, :sort_by, :sort_direction, :search, :current_user + attr_reader :observe_user, :category, :is_public, :project_type, :sort_by, :sort_direction, :search, :start_at, :end_at, :current_user attr_accessor :queried_projects validates :category, inclusion: {in: %w(all join created manage watched forked), message: "请输入正确的Category"} @@ -18,6 +18,8 @@ class Api::V1::Users::Projects::ListService < ApplicationService @sort_by = params[:sort_by] || 'updated_on' @sort_direction = params[:sort_direction] || 'desc' @search = params[:search] + @start_at = params[:start_at] + @end_at = params[:end_at] @current_user = current_user end @@ -53,10 +55,16 @@ class Api::V1::Users::Projects::ListService < ApplicationService projects = Project.from("( #{normal_projects} UNION #{org_projects} ) AS projects").distinct when 'watched' projects = projects.where.not(user_id: observe_user.id).joins(:watchers).where(watchers: {watchable_type: "Project", user_id: observe_user.id}) + projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", start_at, end_at) if start_at.present? && end_at.present? when 'only_watched' projects = projects.where.joins(:watchers).where(watchers: {watchable_type: "Project", user_id: observe_user.id}) + projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", start_at, end_at) if start_at.present? && end_at.present? when 'forked' - fork_ids = observe_user.fork_users.select(:id, :fork_project_id).pluck(:fork_project_id) + if start_at.present? && end_at.present? + fork_ids = observe_user.fork_users.where("created_at > ? and created_at < ?", start_at, end_at).select(:id, :fork_project_id).pluck(:fork_project_id) + else + fork_ids = observe_user.fork_users.select(:id, :fork_project_id).pluck(:fork_project_id) + end projects = projects.where(id: fork_ids) else normal_projects = projects.members_projects(observe_user.id).to_sql From a5a0351266ae1997eb769182b47588d14b1da388 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 28 Oct 2024 20:40:43 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=A1=B9=E7=9B=AE=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/users/projects_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/v1/users/projects_controller.rb b/app/controllers/api/v1/users/projects_controller.rb index ac4b48324..782ed6399 100644 --- a/app/controllers/api/v1/users/projects_controller.rb +++ b/app/controllers/api/v1/users/projects_controller.rb @@ -8,6 +8,6 @@ class Api::V1::Users::ProjectsController < Api::V1::BaseController private def query_params - params.permit(:category, :is_public, :project_type, :sort_by, :sort_direction, :search) + params.permit(:category, :is_public, :project_type, :sort_by, :sort_direction, :search, :start_at, :end_at) end end \ No newline at end of file From e448433cedb5e5066d03060239f1d9f1e0252c99 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 28 Oct 2024 20:43:00 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=A1=B9=E7=9B=AE=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/users/projects/list_service.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/services/api/v1/users/projects/list_service.rb b/app/services/api/v1/users/projects/list_service.rb index 2e2716a21..dc406a955 100644 --- a/app/services/api/v1/users/projects/list_service.rb +++ b/app/services/api/v1/users/projects/list_service.rb @@ -55,13 +55,13 @@ class Api::V1::Users::Projects::ListService < ApplicationService projects = Project.from("( #{normal_projects} UNION #{org_projects} ) AS projects").distinct when 'watched' projects = projects.where.not(user_id: observe_user.id).joins(:watchers).where(watchers: {watchable_type: "Project", user_id: observe_user.id}) - projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", start_at, end_at) if start_at.present? && end_at.present? + projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? when 'only_watched' projects = projects.where.joins(:watchers).where(watchers: {watchable_type: "Project", user_id: observe_user.id}) - projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", start_at, end_at) if start_at.present? && end_at.present? + projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? when 'forked' if start_at.present? && end_at.present? - fork_ids = observe_user.fork_users.where("created_at > ? and created_at < ?", start_at, end_at).select(:id, :fork_project_id).pluck(:fork_project_id) + fork_ids = observe_user.fork_users.where("created_at > ? and created_at < ?", Time.at(start_at), Time.at(end_at)).select(:id, :fork_project_id).pluck(:fork_project_id) else fork_ids = observe_user.fork_users.select(:id, :fork_project_id).pluck(:fork_project_id) end From 4f1a984a7f2b60059e21e1571bdbb350f355cff8 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 28 Oct 2024 20:44:17 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=A1=B9=E7=9B=AE=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/users/projects/list_service.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/api/v1/users/projects/list_service.rb b/app/services/api/v1/users/projects/list_service.rb index dc406a955..e28290725 100644 --- a/app/services/api/v1/users/projects/list_service.rb +++ b/app/services/api/v1/users/projects/list_service.rb @@ -18,8 +18,8 @@ class Api::V1::Users::Projects::ListService < ApplicationService @sort_by = params[:sort_by] || 'updated_on' @sort_direction = params[:sort_direction] || 'desc' @search = params[:search] - @start_at = params[:start_at] - @end_at = params[:end_at] + @start_at = params[:start_at].to_i + @end_at = params[:end_at].to_i @current_user = current_user end From 2140a163ea29b54fda689fdd0a68f8971c3f8f16 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 1 Nov 2024 09:39:12 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=E5=BC=80=E6=BA=90?= =?UTF-8?q?=E5=81=A5=E5=BA=B7=E5=BA=A6=E9=87=8F=E5=BC=80=E5=8F=91=E7=BE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oss_health_measuring_controller.rb | 22 +++++++++++++++++++ config/routes/api.rb | 5 +++++ 2 files changed, 27 insertions(+) create mode 100644 app/controllers/api/v1/projects/oss_health_measuring_controller.rb diff --git a/app/controllers/api/v1/projects/oss_health_measuring_controller.rb b/app/controllers/api/v1/projects/oss_health_measuring_controller.rb new file mode 100644 index 000000000..370a4c824 --- /dev/null +++ b/app/controllers/api/v1/projects/oss_health_measuring_controller.rb @@ -0,0 +1,22 @@ +class Api::V1::Projects::OssHealthMeasuringController < Api::V1::BaseController + + def index + + url = URI("#{EduSetting.get("ohm_server_url")}/api/OSS_Health_Measuring/#{params[:owner]}/#{params[:repo]}") + + http = Net::HTTP.new(url.host, url.port); + request = Net::HTTP::Get.new(url) + response = http.request(request) + render :json=> response.read_body + end + + def can_get + url = URI("#{EduSetting.get("ohm_server_url")}/api/OHM_can_get/#{params[:owner]}/#{params[:repo]}") + + http = Net::HTTP.new(url.host, url.port); + request = Net::HTTP::Get.new(url) + response = http.request(request) + render :json=> response.read_body + end + +end \ No newline at end of file diff --git a/config/routes/api.rb b/config/routes/api.rb index 91900545b..6669adac2 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -131,6 +131,11 @@ defaults format: :json do # projects文件夹下的 scope module: :projects do + resources :oss_health_measuring, only: [:index] do + collection do + get :can_get + end + end resources :portrait, only: [:index] resources :sync_repositories, only: [:create, :index] do collection do From c5505dc4a2b6b2cc6d0458a98b7a16c4d662f796 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 4 Nov 2024 17:16:28 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=BC=80?= =?UTF-8?q?=E6=BA=90=E5=81=A5=E5=BA=B7=E5=BA=A6=E6=8E=A5=E5=8F=A3keyid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/projects/oss_health_measuring_controller.rb | 9 +++++++++ config/routes/api.rb | 1 + 2 files changed, 10 insertions(+) diff --git a/app/controllers/api/v1/projects/oss_health_measuring_controller.rb b/app/controllers/api/v1/projects/oss_health_measuring_controller.rb index 370a4c824..5cc95907f 100644 --- a/app/controllers/api/v1/projects/oss_health_measuring_controller.rb +++ b/app/controllers/api/v1/projects/oss_health_measuring_controller.rb @@ -10,6 +10,15 @@ class Api::V1::Projects::OssHealthMeasuringController < Api::V1::BaseController render :json=> response.read_body end + def keyid + url = URI("#{EduSetting.get("ohm_server_url")}/api/OSS_Health_Measuring/#{params[:owner]}/#{params[:repo]}/#{params[:key_id]}") + + http = Net::HTTP.new(url.host, url.port); + request = Net::HTTP::Get.new(url) + response = http.request(request) + render :json=> response.read_body + end + def can_get url = URI("#{EduSetting.get("ohm_server_url")}/api/OHM_can_get/#{params[:owner]}/#{params[:repo]}") diff --git a/config/routes/api.rb b/config/routes/api.rb index 6669adac2..7f0a68ed6 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -134,6 +134,7 @@ defaults format: :json do resources :oss_health_measuring, only: [:index] do collection do get :can_get + get :keyid end end resources :portrait, only: [:index] From 7d6d95c7eb343c077ff341ede76f783010580a97 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 6 Nov 2024 11:01:58 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8\=E7=82=B9=E8=B5=9E=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 3 +++ app/controllers/watchers_controller.rb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 4724224e8..0ece8f227 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -293,7 +293,10 @@ class ProjectsController < ApplicationController end def praise_users + start_at = params[:start_at] + end_at = params[:end_at] praises = @project.praise_treads.includes(:user).order("praise_treads.created_at desc").distinct + praises = praises.where("praise_treads.created_at > ? and praise_treads.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? @praises_count = praises.size @praises = paginate(praises) end diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb index aa3642616..81ba7ceda 100644 --- a/app/controllers/watchers_controller.rb +++ b/app/controllers/watchers_controller.rb @@ -5,7 +5,10 @@ class WatchersController < ApplicationController before_action :get_target def index + start_at = params[:start_at] + end_at = params[:end_at] scope = @target.watchers.includes(:user) + scope = scope.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? @watchers = paginate(scope) end From 1756c73a3fbb155f55611405649713d807f03695 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 6 Nov 2024 11:10:00 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 0ece8f227..7cf068cd5 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -287,7 +287,10 @@ class ProjectsController < ApplicationController end def watch_users + start_at = params[:start_at] + end_at = params[:end_at] watchers = @project.watchers.includes(:user).order("watchers.created_at desc").distinct + watchers = watchers.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? @watchers_count = watchers.size @watchers = paginate(watchers) end From 4a12ab2d90465449fbbb992a1e6d552eff1fd10a Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 6 Nov 2024 11:11:06 +0800 Subject: [PATCH 15/20] fix: string to number --- app/controllers/projects_controller.rb | 8 ++++---- app/controllers/watchers_controller.rb | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 7cf068cd5..cfd032e5e 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -287,8 +287,8 @@ class ProjectsController < ApplicationController end def watch_users - start_at = params[:start_at] - end_at = params[:end_at] + start_at = params[:start_at].to_i + end_at = params[:end_at].to_i watchers = @project.watchers.includes(:user).order("watchers.created_at desc").distinct watchers = watchers.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? @watchers_count = watchers.size @@ -296,8 +296,8 @@ class ProjectsController < ApplicationController end def praise_users - start_at = params[:start_at] - end_at = params[:end_at] + start_at = params[:start_at].to_i + end_at = params[:end_at].to_i praises = @project.praise_treads.includes(:user).order("praise_treads.created_at desc").distinct praises = praises.where("praise_treads.created_at > ? and praise_treads.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? @praises_count = praises.size diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb index 81ba7ceda..e6d0053a2 100644 --- a/app/controllers/watchers_controller.rb +++ b/app/controllers/watchers_controller.rb @@ -5,8 +5,8 @@ class WatchersController < ApplicationController before_action :get_target def index - start_at = params[:start_at] - end_at = params[:end_at] + start_at = params[:start_at].to_i + end_at = params[:end_at].to_i scope = @target.watchers.includes(:user) scope = scope.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? @watchers = paginate(scope) From dd4b21115f2d96b37efa310a7854ab6525d30b45 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 6 Nov 2024 15:53:21 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=8F=A6=E5=A4=96=E4=B8=80=E4=B8=AA=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../import_issues_from_another_forge.rake | 138 ++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 lib/tasks/import_issues_from_another_forge.rake diff --git a/lib/tasks/import_issues_from_another_forge.rake b/lib/tasks/import_issues_from_another_forge.rake new file mode 100644 index 000000000..7bd9c4e90 --- /dev/null +++ b/lib/tasks/import_issues_from_another_forge.rake @@ -0,0 +1,138 @@ + +desc "导入导出issue、version、journal数据" +namespace :import_from_another_forge do + desc "导出数据" + # 执行示例 bundle exec rake "import_from_another_forge:export[110]" + # RAILS_ENV=production bundle exec rake "import_from_another_forge:export[110]" + task :export, [:project_id] => :environment do |t, args| + project_id = args.project_id + project = Project.find_by_id project_id + Axlsx::Package.new do |p| + p.workbook.add_worksheet(:name => 'version') do |sheet| + sheet.add_row ['id', 'name', 'description', 'effective_date', 'created_on', 'updated_on', 'status', 'creator','issues_count', 'closed_issues_count', 'percent'] + project.versions.each do |version| + sheet.add_row [version.id, version.name, version.description, version.effective_date, version.created_on.strftime("%Y-%m-%d %H:%M:%S"), version.updated_on.strftime("%Y-%m-%d %H:%M:%S"), version.status, version.user.try(:login), version.issues_count, version.closed_issues_count, version.percent] + end + end + p.workbook.add_worksheet(:name => 'issue') do |sheet| + sheet.add_row ['id', 'project_issues_index', 'subject', 'description', 'creator', 'created_on', 'changer', 'updated_on', 'status_id', 'assigners', 'priority_id', 'issue_tags', 'version_id'] + project.issues.issue_issue.each do |issue| + sheet.add_row [issue.id, issue.project_issues_index, issue.subject, issue.description, issue.user.try(:login), issue.created_on.strftime("%Y-%m-%d %H:%M:%S"), issue.changer.try(:login), issue.updated_on.strftime("%Y-%m-%d %H:%M:%S"), issue.status_id, issue.assigners.pluck(:login).join(","),issue.priority_id, issue.issue_tags.pluck(:name, :color).join(","), issue.fixed_version_id] + end + end + issue_ids = project.issues.issue_issue + p.workbook.add_worksheet(:name => 'journal') do |sheet| + sheet.add_row ['id', 'journalized_type', 'journalized_id', 'creator', 'notes', 'created_on', 'parent_id', 'comments_count', 'reply_id', 'updated_on', 'operate_by'] + Journal.where(journalized_type: 'Issue', journalized_id: issue_ids).where.not(notes: nil).each do |journal| + sheet.add_row [journal.id, journal.journalized_type, journal.journalized_id, journal.user.try(:login), journal.notes, journal.created_on.strftime("%Y-%m-%d %H:%M:%S"), journal.parent_id, journal.comments_count, journal.reply_id, journal.updated_on.strftime("%Y-%m-%d %H:%M:%S"), journal.operate_by] + end + end + p.serialize('public/version_issue_journal_data.xlsx') + end + end + + def find_or_create_by(login) + return nil unless login.present? + user = User.find_by(login: login) + return user if user.present? + + user = User.new(admin: false, login: login, mail: "#{login}@forge.com", nickname: login, platform: 'forge' , type: "User") + user.password = "12345678" + user.activate + interactor = Gitea::RegisterInteractor.call({username: login, email: "#{login}@forge.com", password: "12345678"}) + gitea_user = interactor.result + result = Gitea::User::GenerateTokenService.call(username, password) + user.gitea_token = result['sha1'] + user.gitea_uid = gitea_user[:body]['id'] + UserExtension.create!(user_id: user.id) if user.save! + + return user + rescue + return nil + end + + # 执行示例 bundle exec rake "import_from_another_forge:import[filepath, 365, ceshi_org]" + # RAILS_ENV=production bundle exec rake "import_from_another_forge:import[public/version_issue_journal_data.xlsx, 110]" + task :import, [:attachment_uuid, :project_id] => :environment do |t, args| + attachment_uuid = args.attachment_uuid + project_id = args.project_id + a =Attachment.find_by(uuid: attachment_uuid) + project = Project.find_by_id project_id + version_hash = {} + issue_hash = {} + journal_hash = {} + ActiveRecord::Base.transaction do + doc = SimpleXlsxReader.open("#{Rails.root}/tmp/files/#{a.relative_path_filename}") + doc.sheets.each do |sheet| + case sheet.name + when 'version' + sheet.rows.each.with_index do |row, index| + next if index == 0 + version = Version.new(project_id: project_id) + version.name = row[1] + version.description = row[2] + version.effective_date = row[3] + version.created_on = row[4] + version.updated_on = row[5] + version.status = row[6] + version.user = find_or_create_by(row[7]) + version.issues_count = row[8].to_i + version.closed_issues_count = row[9].to_i + version.percent = row[10].to_f + version.save! + version_hash["#{row[0]}"] = version.id + end + when 'issue' + sheet.rows.each.with_index do |row, index| + next if index == 0 + issue = Issue.new(issue_classify: "issue", project_id: project_id, tracker_id: Tracker.first.id) + issue.project_issues_index = row[1] + issue.subject = row[2] + issue.description = row[3] + issue.user = find_or_create_by(row[4]) + issue.created_on = row[5] + issue.changer = find_or_create_by(row[6]) + issue.updated_on = row[7] + issue.status_id = row[8] + if row[9].present? + row[9].split(',').each do |a| + u = find_or_create_by(a) + next unless u.present? + issue.assigners << u + end + end + issue.priority_id = row[10] + issue.issue_tags + if row[11].present? + row[11].split(',').each_slice(2).to_a.each do |t| + tag = IssueTag.find_by(project_id: project_id, name: t[0]) + if tag.present? + issue.issue_tags << tag + else + tag = IssueTag.create(project_id: project_id, name: t[0], color: t[1]) + issue.issue_tags << tag + end + end + end + issue.fixed_version_id = row[12] + issue.save! + issue_hash["#{row[0]}"] = issue.id + when 'journal' + sheet.rows.each.with_index do |row, index| + next if index == 0 + next if row[6].present? || row[8].present? + journal = Journal.new + journal.journalized_type = row[1] + journal.journalized_id = row[2] + journal.user = find_or_create_by(row[3]) + journal.notes = row[4] + journal.created_on = row[5] + journal.updated_on = row[9] + journal.save! + journal_hash["#{row[0]}"] = journal.id + end + end + end + end + +end \ No newline at end of file From 34b5fdfc84cb7e71769e6cd7cedb72c66086d010 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Wed, 6 Nov 2024 16:17:56 +0800 Subject: [PATCH 17/20] =?UTF-8?q?fixed=20=E7=BE=A4=E6=99=BA=E7=86=B5?= =?UTF-8?q?=E6=B1=87=E8=81=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 80cfa92e0..8270a17b4 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -154,6 +154,9 @@ module ProjectsHelper when 'kernel' then "#{url}/v1/openeuler/entropy" when 'opengauss-server' then "#{url}/v1/opengauss/entropy" when 'mindspore' then "#{url}/v1/mindspore/entropy" + when 'openharmony' then "#{url}/api/openharmony/ntropy" + when 'openeuler' then "#{url}/api/openeuler/entropy" + when 'xiuos' then "#{url}/api/xiuos/entropy" else '' end end From f5f73bfa68569fb9605a08054c68914cc11cb131 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 6 Nov 2024 16:29:42 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E6=9B=B4=E6=94=B9:=20=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../import_issues_from_another_forge.rake | 54 +++++++++++-------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/lib/tasks/import_issues_from_another_forge.rake b/lib/tasks/import_issues_from_another_forge.rake index 7bd9c4e90..04c18e79f 100644 --- a/lib/tasks/import_issues_from_another_forge.rake +++ b/lib/tasks/import_issues_from_another_forge.rake @@ -1,6 +1,28 @@ desc "导入导出issue、version、journal数据" namespace :import_from_another_forge do + + def find_or_create_by(login) + return nil unless login.present? + user = User.find_by(login: login) + return user if user.present? + + user = User.new(admin: false, login: login, mail: "#{login}@forge.com", nickname: login, platform: 'forge' , type: "User") + user.password = "12345678" + user.activate + interactor = Gitea::RegisterInteractor.call({username: login, email: "#{login}@forge.com", password: "12345678"}) + gitea_user = interactor.result + result = Gitea::User::GenerateTokenService.call(login, "12345678") + user.gitea_token = result['sha1'] + user.gitea_uid = gitea_user[:body]['id'] + user.save! + UserExtension.create!(user_id: user.id) + + return user + rescue + return nil + end + desc "导出数据" # 执行示例 bundle exec rake "import_from_another_forge:export[110]" # RAILS_ENV=production bundle exec rake "import_from_another_forge:export[110]" @@ -31,25 +53,6 @@ namespace :import_from_another_forge do end end - def find_or_create_by(login) - return nil unless login.present? - user = User.find_by(login: login) - return user if user.present? - - user = User.new(admin: false, login: login, mail: "#{login}@forge.com", nickname: login, platform: 'forge' , type: "User") - user.password = "12345678" - user.activate - interactor = Gitea::RegisterInteractor.call({username: login, email: "#{login}@forge.com", password: "12345678"}) - gitea_user = interactor.result - result = Gitea::User::GenerateTokenService.call(username, password) - user.gitea_token = result['sha1'] - user.gitea_uid = gitea_user[:body]['id'] - UserExtension.create!(user_id: user.id) if user.save! - - return user - rescue - return nil - end # 执行示例 bundle exec rake "import_from_another_forge:import[filepath, 365, ceshi_org]" # RAILS_ENV=production bundle exec rake "import_from_another_forge:import[public/version_issue_journal_data.xlsx, 110]" @@ -114,25 +117,30 @@ namespace :import_from_another_forge do end end end - issue.fixed_version_id = row[12] + issue.fixed_version_id = version_hash["#{row[12]}"] issue.save! issue_hash["#{row[0]}"] = issue.id + end when 'journal' sheet.rows.each.with_index do |row, index| next if index == 0 next if row[6].present? || row[8].present? journal = Journal.new journal.journalized_type = row[1] - journal.journalized_id = row[2] + journal.journalized_id = issue_hash["#{row[2]}"] journal.user = find_or_create_by(row[3]) journal.notes = row[4] journal.created_on = row[5] journal.updated_on = row[9] + journal.parent_id = journal_hash["#{row[6]}"] + journal.reply_id = journal_hash["#{row[8]}"] journal.save! journal_hash["#{row[0]}"] = journal.id end end + end end end - -end \ No newline at end of file + + +end From 2be14cf87c3107bff683eeae69a907b372a7bd74 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Wed, 6 Nov 2024 17:21:43 +0800 Subject: [PATCH 19/20] =?UTF-8?q?fixed=20=E7=BE=A4=E6=99=BA=E7=86=B5?= =?UTF-8?q?=E6=B1=87=E8=81=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 8270a17b4..bb30a01d4 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -154,7 +154,7 @@ module ProjectsHelper when 'kernel' then "#{url}/v1/openeuler/entropy" when 'opengauss-server' then "#{url}/v1/opengauss/entropy" when 'mindspore' then "#{url}/v1/mindspore/entropy" - when 'openharmony' then "#{url}/api/openharmony/ntropy" + when 'openharmony' then "#{url}/api/openharmony/entropy" when 'openeuler' then "#{url}/api/openeuler/entropy" when 'xiuos' then "#{url}/api/xiuos/entropy" else '' From b5d3f69f2176f524bf9297167555cd6178bea6f2 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 7 Nov 2024 11:44:26 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=97=B6?= =?UTF-8?q?=E9=97=B4nil=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 12 ++++++------ app/controllers/watchers_controller.rb | 6 +++--- app/services/api/v1/users/projects/list_service.rb | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index cfd032e5e..dfe8cf3b4 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -287,19 +287,19 @@ class ProjectsController < ApplicationController end def watch_users - start_at = params[:start_at].to_i - end_at = params[:end_at].to_i + start_at = params[:start_at] + end_at = params[:end_at] watchers = @project.watchers.includes(:user).order("watchers.created_at desc").distinct - watchers = watchers.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? + watchers = watchers.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at.to_i), Time.at(end_at.to_i)) if start_at.present? && end_at.present? @watchers_count = watchers.size @watchers = paginate(watchers) end def praise_users - start_at = params[:start_at].to_i - end_at = params[:end_at].to_i + start_at = params[:start_at] + end_at = params[:end_at] praises = @project.praise_treads.includes(:user).order("praise_treads.created_at desc").distinct - praises = praises.where("praise_treads.created_at > ? and praise_treads.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? + praises = praises.where("praise_treads.created_at > ? and praise_treads.created_at < ?", Time.at(start_at.to_i), Time.at(end_at.to_i)) if start_at.present? && end_at.present? @praises_count = praises.size @praises = paginate(praises) end diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb index e6d0053a2..b0305ce81 100644 --- a/app/controllers/watchers_controller.rb +++ b/app/controllers/watchers_controller.rb @@ -5,10 +5,10 @@ class WatchersController < ApplicationController before_action :get_target def index - start_at = params[:start_at].to_i - end_at = params[:end_at].to_i + start_at = params[:start_at] + end_at = params[:end_at] scope = @target.watchers.includes(:user) - scope = scope.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? + scope = scope.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at.to_i), Time.at(end_at.to_i)) if start_at.present? && end_at.present? @watchers = paginate(scope) end diff --git a/app/services/api/v1/users/projects/list_service.rb b/app/services/api/v1/users/projects/list_service.rb index e28290725..e2f2a2f6f 100644 --- a/app/services/api/v1/users/projects/list_service.rb +++ b/app/services/api/v1/users/projects/list_service.rb @@ -18,8 +18,8 @@ class Api::V1::Users::Projects::ListService < ApplicationService @sort_by = params[:sort_by] || 'updated_on' @sort_direction = params[:sort_direction] || 'desc' @search = params[:search] - @start_at = params[:start_at].to_i - @end_at = params[:end_at].to_i + @start_at = params[:start_at] + @end_at = params[:end_at] @current_user = current_user end @@ -55,13 +55,13 @@ class Api::V1::Users::Projects::ListService < ApplicationService projects = Project.from("( #{normal_projects} UNION #{org_projects} ) AS projects").distinct when 'watched' projects = projects.where.not(user_id: observe_user.id).joins(:watchers).where(watchers: {watchable_type: "Project", user_id: observe_user.id}) - projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? + projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at.to_i), Time.at(end_at.to_i)) if start_at.present? && end_at.present? when 'only_watched' projects = projects.where.joins(:watchers).where(watchers: {watchable_type: "Project", user_id: observe_user.id}) - projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? + projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at.to_i), Time.at(end_at.to_i)) if start_at.present? && end_at.present? when 'forked' if start_at.present? && end_at.present? - fork_ids = observe_user.fork_users.where("created_at > ? and created_at < ?", Time.at(start_at), Time.at(end_at)).select(:id, :fork_project_id).pluck(:fork_project_id) + fork_ids = observe_user.fork_users.where("created_at > ? and created_at < ?", Time.at(start_at.to_i), Time.at(end_at.to_i)).select(:id, :fork_project_id).pluck(:fork_project_id) else fork_ids = observe_user.fork_users.select(:id, :fork_project_id).pluck(:fork_project_id) end