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

Merge branch 'dev_trustie' into dev_chain

This commit is contained in:
sylor_huang@126.com 2020-07-10 11:53:49 +08:00
parent 0db202585b c2e1fa27df
commit a20cb9eb5b
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/sync_forge_controller.rb
View File

@ -22,14 +22,16 @@ class SyncForgeController < ApplicationController
project = Projects::CreateService.new(project_user, project_params).call
Rails.logger.info("=================new_project_id:#{project.id}========")
if project.present?
ProjectScore.create!( sync_params[:project_score].merge(project_id: project.id)) if sync_params[:project_score]
SyncRepositoryJob.perform_later(project.repository, sync_params[:repository]) if sync_params[:repository]
ProjectScore.create!( sync_params[:project_score].merge(project_id: project.id)) if sync_params[:project_score].present?
Rails.logger.info("=================sync_params_test:#{sync_params[:project_score]}========")
Rails.logger.info("=================repository_present?:#{sync_params[:repository]}========")
SyncRepositoryJob.perform_later(project.repository, sync_params[:repository]) if sync_params[:repository].present?
check_new_project(project, sync_params)
end
end
end
rescue Exception => e
Rails.logger.info("=================has_errors:==#{e}")
Rails.logger.info("=================has_errors:==#{e.message}")
end
def sync_users
@ -110,6 +112,7 @@ class SyncForgeController < ApplicationController
parent_id: project.id
}
SyncProjectsJob.perform_later(sync_projects_params)
Rails.logger.info("***6. end_to_sync_parises---------------")
end
end

13
app/services/repositories/create_service.rb
View File

@ -15,19 +15,6 @@ class Repositories::CreateService < ApplicationService
gitea_repository = Gitea::Repository::CreateService.new(user.gitea_token, gitea_repository_params).call
sync_project(@repository, gitea_repository)
sync_repository(@repository, gitea_repository)
if project.project_type == "common"
chain_params = {
type: "create",
chain_params:{
username: user.try(:login),
reponame: @repository.try(:identifier),
token_name: @repository.try(:identifier),
total_supply: 1000000
}
}
PostChainJob.perform_later(chain_params) #创建上链操作
end
else
Rails.logger.info("#############___________create_repository_erros______###########{@repository.errors.messages}")
end
@repository