From 5559330706dc20835f47dd41a58a217c61e33eb8 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 14 May 2024 11:05:00 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=8E=B7?= =?UTF-8?q?=E5=8F=96github=E3=80=81gitee=E5=88=86=E6=94=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/projects/branches_controller.rb | 23 +++++++++++++++++++ config/routes/api.rb | 2 ++ 2 files changed, 25 insertions(+) diff --git a/app/controllers/api/v1/projects/branches_controller.rb b/app/controllers/api/v1/projects/branches_controller.rb index 89ebb5825..2bb7fdaf5 100644 --- a/app/controllers/api/v1/projects/branches_controller.rb +++ b/app/controllers/api/v1/projects/branches_controller.rb @@ -1,6 +1,29 @@ class Api::V1::Projects::BranchesController < Api::V1::BaseController before_action :require_public_and_member_above, only: [:index, :all] + def gitee + url = URI("https://gitee.com/api/v5/repos/#{params[:owner]}/#{params[:repo]}/branches?access_token=#{params[:token]}&page=#{page}&per_page=#{limit}") + https = Net::HTTP.new(url.host, url.port) + https.use_ssl = true + request = Net::HTTP::Get.new(url) + response = https.request(request) + render :json => response.read_body + end + + def github + url = URI("https://api.github.com/repos/#{params[:owner]}/#{params[:repo]}/branches?page=#{page}&per_page=#{limit}") + https = Net::HTTP.new(url.host, url.port) + https.use_ssl = true + + request = Net::HTTP::Get.new(url) + request["Authorization"] = "Bearer #{params[:token]}" + request["Accept"] = "application/vnd.github+json" + request["X-GitHub-Api-Version"] = "2022-11-28" + + response = https.request(request) + render :json => response.read_body + end + def index @result_object = Api::V1::Projects::Branches::ListService.call(@project, {name: params[:keyword], state: params[:state], page: page, limit: limit}, current_user&.gitea_token) end diff --git a/config/routes/api.rb b/config/routes/api.rb index e42afba53..b502a679e 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -118,6 +118,8 @@ defaults format: :json do end resources :branches, param: :name, only:[:index, :create, :destroy] do collection do + get :gitee + get :github get :all post :restore patch :update_default_branch From 871904fb9c7e4d54dd6ed423ce23b71ed2131644 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 14 May 2024 15:01:04 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E5=90=8C=E6=AD=A5=E4=B8=8D=E9=9C=80=E8=A6=81=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E5=88=86=E6=94=AF=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/sync_repositories/create_service.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/services/api/v1/projects/sync_repositories/create_service.rb b/app/services/api/v1/projects/sync_repositories/create_service.rb index 6b64efab2..4a0dc5091 100644 --- a/app/services/api/v1/projects/sync_repositories/create_service.rb +++ b/app/services/api/v1/projects/sync_repositories/create_service.rb @@ -8,7 +8,7 @@ class Api::V1::Projects::SyncRepositories::CreateService < ApplicationService validates :type, inclusion: {in: %w(SyncRepositories::Gitee SyncRepositories::Github)} validates :external_repo_address, format: { with: CustomRegexp::URL_REGEX, multiline: true, message: "地址格式不正确" } validates :sync_granularity, :first_sync_direction, inclusion: {in: [1,2]} - validate :check_gitlink_branch_name + # validate :check_gitlink_branch_name def initialize(project, params) @project = project @@ -40,12 +40,12 @@ class Api::V1::Projects::SyncRepositories::CreateService < ApplicationService [@sync_repository1, @sync_repository2, @sync_repository_branch1, @sync_repository_branch2] end - def check_gitlink_branch_name - if sync_granularity == 2 - result = $gitea_hat_client.get_repos_branch_name_set_by_owner_repo(project&.owner&.login, project&.identifier) rescue nil - raise Error, '分支不存在' if !result.include?(gitlink_branch_name) - end - end + # def check_gitlink_branch_name + # if sync_granularity == 2 + # result = $gitea_hat_client.get_repos_branch_name_set_by_owner_repo(project&.owner&.login, project&.identifier) rescue nil + # raise Error, '分支不存在' if !result.include?(gitlink_branch_name) + # end + # end private def create_sync_repository From 4fbf7a52cd63c50d25c6e4cdcbdbf5d30646b58e Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 15 May 2024 15:00:17 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E8=AE=B0=E5=BD=95=E5=88=86=E6=94=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8F=96=E5=90=8C=E6=AD=A5=E6=97=B6=E9=97=B4=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/projects/sync_repositories_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/v1/projects/sync_repositories_controller.rb b/app/controllers/api/v1/projects/sync_repositories_controller.rb index ada71fa7d..f8b466420 100644 --- a/app/controllers/api/v1/projects/sync_repositories_controller.rb +++ b/app/controllers/api/v1/projects/sync_repositories_controller.rb @@ -112,7 +112,7 @@ class Api::V1::Projects::SyncRepositoriesController < Api::V1::BaseController @group_sync_repository_branch = @sync_repository_branches.joins(:sync_repository).group("sync_repositories.type, sync_repository_branches.gitlink_branch_name, sync_repository_branches.external_branch_name").select("sync_repositories.type as type,max(sync_repository_branches.updated_at) as updated_at, sync_repository_branches.gitlink_branch_name, sync_repository_branches.external_branch_name").sort_by{|i|i.updated_at} @each_json = [] @group_sync_repository_branch.each do |item| - branches = @sync_repository_branches.joins(:sync_repository).where(sync_repositories: {type: item.type}, gitlink_branch_name: item.gitlink_branch_name, external_branch_name: item.external_branch_name).order(updated_at: :desc) + branches = @sync_repository_branches.joins(:sync_repository).where(sync_repositories: {type: item.type}, gitlink_branch_name: item.gitlink_branch_name, external_branch_name: item.external_branch_name).order(sync_time: :desc) branch = branches.first @each_json << { gitlink_branch_name: item.gitlink_branch_name, From c6ae30f2cd47ebc8a22f1493950c29303b0d725d Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 16 May 2024 14:33:14 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9Areadme=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E5=A4=84=E7=90=86=E6=96=9C=E6=9D=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/repositories_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index dac637764..360f7d03f 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -157,6 +157,7 @@ module RepositoriesHelper ext = File.extname(s_content)[1..-1] ext = ext.split("?")[0] if ext.include?("?") if (image_type?(ext) || download_type(ext)) && !ext.blank? + s_content = s_content.starts_with?("/") ? s_content[1..-1] : s_content[0..-1] s_content = File.expand_path(s_content, file_path) s_content = s_content.split("#{Rails.root}/")[1] # content = content.gsub(s[0], "/#{s_content}") From caa7acc654a80eaef130b849183f43c3359fd9cc Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 22 May 2024 11:05:40 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=BC=80?= =?UTF-8?q?=E6=BA=90=E5=A4=A7=E8=B5=9B=E6=88=98=E9=98=9F=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=87=B3gitlink?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gitlink_competition_applies_controller.rb | 37 +++++++++++++++++++ app/models/gitlink_competition_apply.rb | 21 +++++++++++ config/routes/api.rb | 1 + ...5212_create_gitlink_competition_applies.rb | 19 ++++++++++ spec/models/gitlink_competition_apply_spec.rb | 5 +++ 5 files changed, 83 insertions(+) create mode 100644 app/controllers/api/v1/gitlink_competition_applies_controller.rb create mode 100644 app/models/gitlink_competition_apply.rb create mode 100644 db/migrate/20240522015212_create_gitlink_competition_applies.rb create mode 100644 spec/models/gitlink_competition_apply_spec.rb diff --git a/app/controllers/api/v1/gitlink_competition_applies_controller.rb b/app/controllers/api/v1/gitlink_competition_applies_controller.rb new file mode 100644 index 000000000..5f2d7ef28 --- /dev/null +++ b/app/controllers/api/v1/gitlink_competition_applies_controller.rb @@ -0,0 +1,37 @@ +class Api::V1::GitlinkCompetitionAppliesController < Api::V1::BaseController + + def create + return render_error("请输入正确的竞赛ID") unless params[:competition_id].present? + return render_error("请输入正确的队伍ID") unless params[:team_id].present? + return render_error("请输入正确的队伍成员信息") unless params[:team_members].is_a?(Array) + params[:team_members].each do |member| + apply = GitlinkCompetitionApply.find_or_create_by(competition_id: params[:competition_id], team_id: params[:team_id], educoder_login: member[:login]) + apply.competition_identifier = params[:competition_identifier] + apply.team_name = params[:team_name] + apply.school_name = member[:school_name] + apply.nickname = member[:nickname] + apply.identity = member[:identity] + apply.role = member[:role] + apply.email = member[:email] + user_info = get_user_info_by_educoder_login(member[:login]) + apply.phone = user_info["phone"] + apply.save + end + render_ok + end + + def get_user_info_by_educoder_login(edu_login) + req_params = { "login" => "#{edu_login}", "private_token" => "hriEn3UwXfJs3PmyXnqQ" } + api_url= "https://data.educoder.net" + client = Faraday.new(url: api_url) + response = client.public_send("get", "/api/sources/get_user_info_by_login", req_params) + result = JSON.parse(response.body) + + return nil if result["status"].to_s != "0" + + # login 邮箱 手机号 姓名 学校/单位 + user_info = result["data"] + + return user_info + end +end \ No newline at end of file diff --git a/app/models/gitlink_competition_apply.rb b/app/models/gitlink_competition_apply.rb new file mode 100644 index 000000000..f3b7d4ce1 --- /dev/null +++ b/app/models/gitlink_competition_apply.rb @@ -0,0 +1,21 @@ + # == Schema Information +# +# Table name: gitlink_competition_applies +# +# id :integer not null, primary key +# competition_id :integer +# competition_identifier :string(255) +# team_id :integer +# team_name :string(255) +# school_name :string(255) +# login :string(255) +# nickname :string(255) +# phone :string(255) +# identity :string(255) +# role :string(255) +# created_at :datetime not null +# updated_at :datetime not null +# + +class GitlinkCompetitionApply < ApplicationRecord +end diff --git a/config/routes/api.rb b/config/routes/api.rb index b502a679e..59d061629 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -159,6 +159,7 @@ defaults format: :json do resources :projects, only: [:index] resources :project_topics, only: [:index, :create, :destroy] resources :project_datasets, only: [:index] + resources :gitlink_competition_applies, only: [:create] end end diff --git a/db/migrate/20240522015212_create_gitlink_competition_applies.rb b/db/migrate/20240522015212_create_gitlink_competition_applies.rb new file mode 100644 index 000000000..6f24a0922 --- /dev/null +++ b/db/migrate/20240522015212_create_gitlink_competition_applies.rb @@ -0,0 +1,19 @@ +class CreateGitlinkCompetitionApplies < ActiveRecord::Migration[5.2] + def change + create_table :gitlink_competition_applies do |t| + t.integer :competition_id + t.string :competition_identifier + t.integer :team_id + t.string :team_name + t.string :school_name + t.string :educoder_login + t.string :nickname + t.string :phone + t.string :email + t.string :identity + t.string :role + + t.timestamps + end + end +end diff --git a/spec/models/gitlink_competition_apply_spec.rb b/spec/models/gitlink_competition_apply_spec.rb new file mode 100644 index 000000000..8b05ff4ad --- /dev/null +++ b/spec/models/gitlink_competition_apply_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe GitlinkCompetitionApply, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end From 572a6de2ad823db9e71ff7633613e89d9cacc12c Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 28 May 2024 15:55:22 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Aactions=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E8=BF=90=E8=A1=8C=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 +- .../v1/projects/actions/runs_controller.rb | 34 +++++++++++++++++++ config/routes/api.rb | 3 ++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index edaae8a75..811fabc41 100644 --- a/Gemfile +++ b/Gemfile @@ -141,4 +141,4 @@ gem 'doorkeeper' gem 'doorkeeper-jwt' -gem 'gitea-client', '~> 1.4.6' +gem 'gitea-client', '~> 1.5.7' diff --git a/app/controllers/api/v1/projects/actions/runs_controller.rb b/app/controllers/api/v1/projects/actions/runs_controller.rb index 05918dbe2..ff7c28e85 100644 --- a/app/controllers/api/v1/projects/actions/runs_controller.rb +++ b/app/controllers/api/v1/projects/actions/runs_controller.rb @@ -5,8 +5,42 @@ class Api::V1::Projects::Actions::RunsController < Api::V1::Projects::Actions::B puts @result_object end + def rerun + return render_error("请输入正确的流水线记录ID！") if params[:run_id].blank? + gitea_result = $gitea_hat_client.post_repos_actions_runs_rerun_by_owner_repo_run(@project&.owner&.login, @project&.identifier, params[:run_id]) rescue nil + if gitea_result + render_ok + else + render_error("重启所有流水线任务失败") + end + end + + def job_rerun + return render_error("请输入正确的流水线记录ID！") if params[:run_id].blank? + return render_error("请输入正确的流水线任务ID") if params[:job].blank? + gitea_result = $gitea_hat_client.post_repos_actions_runs_jobs_rerun_by_owner_repo_run_job(@project&.owner&.login, @project&.identifier, params[:run_id], params[:job]) rescue nil + if gitea_result + render_ok + else + render_error("重启流水线任务失败") + end + end + def job_show @result_object = Api::V1::Projects::Actions::Runs::JobShowService.call(@project, params[:run_id], params[:job], params[:log_cursors], current_user&.gitea_token) end + def job_logs + return render_error("请输入正确的流水线记录ID！") if params[:run_id].blank? + return render_error("请输入正确的流水线任务ID") if params[:job].blank? + domain = GiteaService.gitea_config[:domain] + api_url = GiteaService.gitea_config[:hat_base_url] + + url = "/repos/#{@owner.login}/#{@repository.identifier}/actions/runs/#{CGI.escape(params[:run_id])}/jobs/#{CGI.escape(params[:job])}/logs" + file_path = [domain, api_url, url].join + file_path = [file_path, "access_token=#{@owner&.gitea_token}"].join("?") + + redirect_to file_path + end + end \ No newline at end of file diff --git a/config/routes/api.rb b/config/routes/api.rb index 59d061629..34751cf50 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -96,6 +96,9 @@ defaults format: :json do post :enable resources :runs, only: [:index] do post '/jobs/:job', to: 'runs#job_show' + post '/rerun', to: 'runs#rerun' + post '/jobs/:job/rerun', to: 'runs#job_rerun' + get '/jobs/:job/logs', to: 'runs#job_logs' end end end