diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index ad145f492..714353792 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -29,7 +29,8 @@ class PullRequestsController < ApplicationController @projects_names = [{ project_user_login: @user.try(:login), project_name: "#{@user.try(:show_real_name)}/#{@repository.try(:identifier)}", - project_id: @project.id + project_id: @project.identifier, + id: @project.id }] @merge_projects = @projects_names fork_project = @project.fork_project if @is_fork @@ -37,7 +38,8 @@ class PullRequestsController < ApplicationController @merge_projects.push({ project_user_login: fork_project.owner.try(:login), project_name: "#{fork_project.owner.try(:show_real_name)}/#{fork_project.repository.try(:identifier)}", - project_id: fork_project.id + project_id: fork_project.identifier, + id: fork_project.id }) end end diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index 882118d00..12a2cac49 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -5,7 +5,7 @@ class SyncForgeController < ApplicationController sync_counts = params[:sync_count] || 10 projects = Project.includes(:project_score, :repository) .where(is_public: true) - .where.not(identifier: ["educoder","trustieforge", "gitlab"]) + .where.not(identifier: ["educoder","trustieforge", "gitlab", "rGDBbQmOK", "socialforge"]) .joins(:project_score).order("project_scores.changeset_num desc").limit(sync_counts.to_i) projects.each do | project | SyncProjectMilitaryJob.perform_later(project, project.repository, project.project_score) diff --git a/app/jobs/sync_project_military_job.rb b/app/jobs/sync_project_military_job.rb index 0cf76f7a9..8c52181e6 100644 --- a/app/jobs/sync_project_military_job.rb +++ b/app/jobs/sync_project_military_job.rb @@ -5,18 +5,18 @@ class SyncProjectMilitaryJob < ApplicationJob queue_as :default def perform(project, repository, project_socre) - Rails.logger.info("============begin to sync project ===========") - project_except_params = %w(praises_count watchers_count issues_count pull_requests_count versions_count issue_tags_count closed_issues_count) + SyncLog.sync_log("============begin to sync project, project_id: #{project.id} ===========") + project_except_params = %w(id user_id praises_count watchers_count issues_count pull_requests_count versions_count issue_tags_count closed_issues_count forked_from_project_id forked_count) project_params = { project: project.as_json(except: project_except_params), - repository: repository.as_json, - project_socre: project_socre.as_json + repository: repository.as_json(except: %w(id project_id login user_id)), + project_socre: project_socre.as_json(except: %w(id project_id)) } - url = "http://47.93.212.82:49999/sync_forges" #trustie上的相关路由 + url = "http://39.105.176.215:49999/api/sync_forge/sync_projects" #trustie上的相关路由 uri = URI.parse(url) http = Net::HTTP.new(uri.hostname, uri.port) http.use_ssl = false response = http.send_request('POST', uri.path, project_params.to_json, {'Content-Type' => 'application/json'}) - Rails.logger.info("============end to sync project, status: #{response.code} ===========") + SyncLog.sync_log("============end to sync project, status: #{response.code} ===========") end end diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb index 7287c0347..de56a5477 100644 --- a/app/views/admins/shared/_sidebar.html.erb +++ b/app/views/admins/shared/_sidebar.html.erb @@ -41,7 +41,7 @@ <% end %>
  • - <%= sidebar_item('/sidekiq', '定时任务', icon: 'bell', controller: 'root') %> + <%= sidebar_item('/admins/sidekiq', '定时任务', icon: 'bell', controller: 'root') %>
  • <%= sidebar_item('/', '返回主站', icon: 'sign-out', controller: 'root') %>
  • diff --git a/app/views/projects/migrate.json.jbuilder b/app/views/projects/migrate.json.jbuilder index 818eb0180..c9ae044ee 100644 --- a/app/views/projects/migrate.json.jbuilder +++ b/app/views/projects/migrate.json.jbuilder @@ -1 +1 @@ -json.extract! @project, :id, :name +json.extract! @project, :id, :name, :identifier diff --git a/app/views/pull_requests/new.json.jbuilder b/app/views/pull_requests/new.json.jbuilder index ab0e87135..8110e2972 100644 --- a/app/views/pull_requests/new.json.jbuilder +++ b/app/views/pull_requests/new.json.jbuilder @@ -1,5 +1,6 @@ json.partial! "commons/success" -json.project_id @project.id +json.project_id @project.identifier +json.id @project.id json.branches @all_branches json.is_fork @is_fork json.projects_names @projects_names diff --git a/config/routes.rb b/config/routes.rb index 6079dfeb0..e557edf81 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,7 @@ Rails.application.routes.draw do require 'sidekiq/web' require 'admin_constraint' - mount Sidekiq::Web => '/sidekiq' + # mount Sidekiq::Web => '/sidekiq', :constraints => AdminConstraint.new # Serve websocket cable requests in-process mount ActionCable.server => '/cable' @@ -17,7 +17,7 @@ Rails.application.routes.draw do get 'oauth/bind', to: 'oauth/educoder#bind' get 'oauth/register', to: 'oauth#register' post 'oauth/auto_register', to: 'oauth#auto_register' - + resources :edu_settings scope '/api' do namespace :ci do @@ -401,6 +401,7 @@ Rails.application.routes.draw do end namespace :admins do + mount Sidekiq::Web => '/sidekiq' get '/', to: 'dashboards#index' resources :project_statistics, only: [:index] do collection do