From d155bdb71a8cf95bda05ec874650df653688b4e2 Mon Sep 17 00:00:00 2001 From: zhangxunhui Date: Sun, 15 May 2022 11:28:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86gitea=20domain?= =?UTF-8?q?=E5=90=8E=E7=9A=843000=E7=AB=AF=E5=8F=A3=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/gitea/client_service.rb | 4 ++-- app/services/projects/create_service.rb | 27 +++++++++++++------------ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/services/gitea/client_service.rb b/app/services/gitea/client_service.rb index de3825fb..b0c842db 100644 --- a/app/services/gitea/client_service.rb +++ b/app/services/gitea/client_service.rb @@ -77,7 +77,7 @@ class Gitea::ClientService < ApplicationService puts "[gitea] token: #{token}" @client ||= begin - Faraday.new(url: domain+":3000") do |req| + Faraday.new(url: domain) do |req| req.request :url_encoded req.headers['Content-Type'] = 'application/json' req.response :logger # 显示日志 @@ -104,7 +104,7 @@ class Gitea::ClientService < ApplicationService end def api_url - [domain+":3000", base_url].join('') + [domain, base_url].join('') end def full_url(api_rest, action='post') diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index d2cbbd54..9a16b7b4 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -10,21 +10,22 @@ class Projects::CreateService < ApplicationService Rails.logger.info("#############__________project_params______###########{project_params}") raise Error, "user_id不正确." unless authroize_user_id_success - @project = Project.new(project_params) - ActiveRecord::Base.transaction do - if @project.save! - Project.update_common_projects_count! - ProjectUnit.init_types(@project.id) - Repositories::CreateService.new(user, @project, repository_params).call + # 创建用户的时候也会调用这里的代码，所以获取到的参数不是project相关的参数 # + # @project = Project.new(project_params) + # ActiveRecord::Base.transaction do + # if @project.save! + # Project.update_common_projects_count! + # ProjectUnit.init_types(@project.id) + # Repositories::CreateService.new(user, @project, repository_params).call - # insert related tokens number and percentage of init tokens on blockchain - create_repo_on_blockchain(params, @project) + # # insert related tokens number and percentage of init tokens on blockchain + # create_repo_on_blockchain(params, @project) - else - Rails.logger.info("#############___________create_project_erros______###########{@project.errors.messages}") - end - end - @project + # else + # Rails.logger.info("#############___________create_project_erros______###########{@project.errors.messages}") + # end + # end + # @project rescue => e puts "create project service error: #{e.message}" normal_status(-1, e.message)