forked from Gitlink/forgeplus
change main
This commit is contained in:
parent
7a0106578b
commit
147fdb0d05
|
@ -2,6 +2,7 @@ class SyncForgeController < ApplicationController
|
|||
before_action :check_token
|
||||
|
||||
def create
|
||||
Rails.logger.info("=================request.subdomain:#{request.subdomain}========")
|
||||
ActiveRecord::Base.transaction do
|
||||
params.permit!
|
||||
sync_params = params[:sync_params]
|
||||
|
@ -30,7 +31,14 @@ class SyncForgeController < ApplicationController
|
|||
new_project_score = ProjectScore.create(score_params)
|
||||
Rails.logger.info("=================new_project_score:#{new_project_score.try(:id)}========")
|
||||
end
|
||||
SyncRepositoryJob.perform_later(project.repository, sync_params[:repository]) if sync_params[:repository].present?
|
||||
|
||||
gitea_main = "testgitea.trustie.net"
|
||||
if request.subdomain === 'testforgeplus'
|
||||
gitea_main = "testgitea2.trustie.net"
|
||||
elsif request.subdomain === 'forge'
|
||||
gitea_main = "gitea.trustie.net"
|
||||
end
|
||||
SyncRepositoryJob.perform_later(project.repository, sync_params[:repository], gitea_main) if sync_params[:repository].present?
|
||||
check_new_project(project, sync_params)
|
||||
end
|
||||
end
|
||||
|
@ -101,7 +109,13 @@ class SyncForgeController < ApplicationController
|
|||
sync_params: sync_params,
|
||||
new_project_id: project.id
|
||||
}
|
||||
SyncProjectsJob.perform_later(sync_projects_params)
|
||||
|
||||
gitea_main = "https://ucloudtest.trustie.net/"
|
||||
if request.subdomain === 'forgeplus'
|
||||
gitea_main = "https://trustie.net"
|
||||
end
|
||||
|
||||
SyncProjectsJob.perform_later(sync_projects_params, gitea_main)
|
||||
Rails.logger.info("***8. end_to_sync_new_project---------------")
|
||||
end
|
||||
|
||||
|
|
|
@ -4,14 +4,11 @@ require 'net/http'
|
|||
class SyncProjectsJob < ApplicationJob
|
||||
queue_as :default
|
||||
|
||||
def perform(sync_params)
|
||||
def perform(sync_params, gitea_main)
|
||||
SyncLog.sync_log("==========begin to sync #{sync_params[:type]} to forge============")
|
||||
begin
|
||||
SyncLog.sync_log("=========request.subdomain: #{request.subdomain}============")
|
||||
gitea_main = "https://ucloudtest.trustie.net/"
|
||||
if request.subdomain === 'forgeplus'
|
||||
gitea_main = "https://trustie.net"
|
||||
end
|
||||
|
||||
|
||||
url = "#{gitea_main}/sync_forges" #trustie上的相关路由
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ class SyncRepositoryJob < ApplicationJob
|
|||
|
||||
#同步 trustie的仓库
|
||||
|
||||
def perform(repository, repository_params)
|
||||
def perform(repository, repository_params, gitea_main)
|
||||
#创建临时文件夹 clone 并强推代码
|
||||
SyncLog.sync_log("=================begin to sync request trustie repository=====================")
|
||||
path = "#{Rails.root}/public/cache_repository"
|
||||
|
@ -14,13 +14,7 @@ class SyncRepositoryJob < ApplicationJob
|
|||
g_default_branch = repository_params[:default_branch]
|
||||
image_repo_name = image_url.to_s.split('/')&.last&.chomp('.git')
|
||||
check_clone = system("cd #{path} and git clone #{image_url}")
|
||||
|
||||
gitea_main = "testgitea.trustie.net"
|
||||
if request.subdomain === 'testforgeplus'
|
||||
gitea_main = "testgitea2.trustie.net"
|
||||
elsif request.subdomain === 'forge'
|
||||
gitea_main = "gitea.trustie.net"
|
||||
end
|
||||
|
||||
|
||||
if check_clone
|
||||
new_gitlab_url = "http://root:_Trustie_10010@#{gitea_main}/#{repository.user.login}/#{repository.identifier}.git"
|
||||
|
|
Loading…
Reference in New Issue