From c5ec05ea77763eef61b7220f99de46b889a9e2fa Mon Sep 17 00:00:00 2001 From: xxq250 Date: Mon, 13 May 2024 08:54:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fixed=20utf8mb4=E5=AD=97=E7=AC=A6=E7=B4=A2?= =?UTF-8?q?=E5=BC=95=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20240408010213_create_action_node_selects.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20240408010213_create_action_node_selects.rb b/db/migrate/20240408010213_create_action_node_selects.rb index 5f49bcd8b..9d07fe4ba 100644 --- a/db/migrate/20240408010213_create_action_node_selects.rb +++ b/db/migrate/20240408010213_create_action_node_selects.rb @@ -11,7 +11,7 @@ class CreateActionNodeSelects < ActiveRecord::Migration[5.2] t.integer :use_count, default: 0 t.references :user t.timestamps - t.index :name + t.index :name, length: 191 end end end From 5559330706dc20835f47dd41a58a217c61e33eb8 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 14 May 2024 11:05:00 +0800 Subject: [PATCH 2/4] =?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 3/4] =?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 4/4] =?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,