floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

change main

This commit is contained in:
sylor_huang@126.com 2020-07-10 16:59:54 +08:00
parent 7a0106578b
commit 147fdb0d05
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/controllers/sync_forge_controller.rb
View File

@ -2,6 +2,7 @@ class SyncForgeController < ApplicationController
before_action :check_token before_action :check_token
def create def create
Rails.logger.info("=================request.subdomain:#{request.subdomain}========")
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
params.permit! params.permit!
sync_params = params[:sync_params] sync_params = params[:sync_params]
@ -30,7 +31,14 @@ class SyncForgeController < ApplicationController
new_project_score = ProjectScore.create(score_params) new_project_score = ProjectScore.create(score_params)
Rails.logger.info("=================new_project_score:#{new_project_score.try(:id)}========") Rails.logger.info("=================new_project_score:#{new_project_score.try(:id)}========")
end 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) check_new_project(project, sync_params)
end end
end end
@ -101,7 +109,13 @@ class SyncForgeController < ApplicationController
sync_params: sync_params, sync_params: sync_params,
new_project_id: project.id 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---------------") Rails.logger.info("***8. end_to_sync_new_project---------------")
end end

7
app/jobs/sync_projects_job.rb
View File

@ -4,14 +4,11 @@ require 'net/http'
class SyncProjectsJob < ApplicationJob class SyncProjectsJob < ApplicationJob
queue_as :default queue_as :default
def perform(sync_params) def perform(sync_params, gitea_main)
SyncLog.sync_log("==========begin to sync #{sync_params[:type]} to forge============") SyncLog.sync_log("==========begin to sync #{sync_params[:type]} to forge============")
begin begin
SyncLog.sync_log("=========request.subdomain: #{request.subdomain}============") 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上的相关路由 url = "#{gitea_main}/sync_forges" #trustie上的相关路由

10
app/jobs/sync_repository_job.rb
View File

@ -3,7 +3,7 @@ class SyncRepositoryJob < ApplicationJob
#同步 trustie的仓库 #同步 trustie的仓库
def perform(repository, repository_params) def perform(repository, repository_params, gitea_main)
#创建临时文件夹 clone 并强推代码 #创建临时文件夹 clone 并强推代码
SyncLog.sync_log("=================begin to sync request trustie repository=====================") SyncLog.sync_log("=================begin to sync request trustie repository=====================")
path = "#{Rails.root}/public/cache_repository" path = "#{Rails.root}/public/cache_repository"
@ -14,13 +14,7 @@ class SyncRepositoryJob < ApplicationJob
g_default_branch = repository_params[:default_branch] g_default_branch = repository_params[:default_branch]
image_repo_name = image_url.to_s.split('/')&.last&.chomp('.git') image_repo_name = image_url.to_s.split('/')&.last&.chomp('.git')
check_clone = system("cd #{path} and git clone #{image_url}") 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 if check_clone
new_gitlab_url = "http://root:_Trustie_10010@#{gitea_main}/#{repository.user.login}/#{repository.identifier}.git" new_gitlab_url = "http://root:_Trustie_10010@#{gitea_main}/#{repository.user.login}/#{repository.identifier}.git"