Browse Source

FIx code review

tags/v1.0.0
Jasder 5 years ago
parent
commit
2866c060c7
3 changed files with 10 additions and 4 deletions
  1. +2
    -1
      app/controllers/ci/projects_controller.rb
  2. +4
    -1
      app/models/ci/remote_base.rb
  3. +4
    -2
      app/models/ci/repo.rb

+ 2
- 1
app/controllers/ci/projects_controller.rb View File

@@ -3,6 +3,7 @@ class Ci::ProjectsController < Ci::BaseController
include RepositoriesHelper include RepositoriesHelper


before_action :load_project before_action :load_project
before_action :load_repo, only: [:update_trustie_pipeline]


def authorize def authorize
@user = current_user @user = current_user
@@ -31,7 +32,7 @@ class Ci::ProjectsController < Ci::BaseController
interactor = Gitea::UpdateFileInteractor.call(current_user.gitea_token, params[:owner], params.merge(identifier: @project.identifier)) interactor = Gitea::UpdateFileInteractor.call(current_user.gitea_token, params[:owner], params.merge(identifier: @project.identifier))
if interactor.success? if interactor.success?
@file = interactor.result @file = interactor.result
Ci::Drone::API.new(current_user.cloud_account.drone_token, current_user.cloud_account.drone_url, params[:owner], @project.identifier, config_path: '.trustie-pipeline.yml').config_yml
@repo.config_trustie_pipeline
render_result(1, "更新成功") render_result(1, "更新成功")
else else
render_error(interactor.error) render_error(interactor.error)


+ 4
- 1
app/models/ci/remote_base.rb View File

@@ -3,5 +3,8 @@ class Ci::RemoteBase < ApplicationRecord


establish_connection Rails.configuration.database_configuration[Rails.env]["ci_server_db"] establish_connection Rails.configuration.database_configuration[Rails.env]["ci_server_db"]



def generate_code
[*'a'..'z',*'0'..'9',*'A'..'Z'].sample(32).join
end
end end

+ 4
- 2
app/models/ci/repo.rb View File

@@ -16,11 +16,13 @@ class Ci::Repo < Ci::RemoteBase
[user, repo] [user, repo]
end end


def enable
def config_trustie_pipeline
update_column(:repo_config, '.trustie-pipeline.yml') update_column(:repo_config, '.trustie-pipeline.yml')
end end


def activate def activate
# repo_active、repo_signer、repo_secret、repo_updated
update_columns(repo_active: 1, repo_signer: generate_code, repo_secret: generate_code, repo_updated: Time.now.to_i)
end end

end end

Loading…
Cancel
Save