From 71fd9969cb513b910d83f8dfbf42481aa3462017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Thu, 31 Aug 2023 09:22:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=83=A8=E7=BD=B2=E5=9F=9F?= =?UTF-8?q?=E5=90=8D=E6=9D=A5=E6=BA=90=EF=BC=8C=E5=8F=AF=E4=BB=8E=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E8=AE=BE=E7=BD=AE=E8=BF=9B=E8=A1=8C=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/page.rb | 3 ++- app/services/page_service.rb | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/models/page.rb b/app/models/page.rb index 44cfdc74c..1b5f9a018 100644 --- a/app/models/page.rb +++ b/app/models/page.rb @@ -43,7 +43,8 @@ class Page < ApplicationRecord end def url - "http://#{user.login}.kingchan.cn/#{identifier}" + @deploy_domain = EduSetting.find_by_name("site_page_deploy_domain").try(:value) + "http://#{user.login}.#{@deploy_domain}/#{identifier}" end end diff --git a/app/services/page_service.rb b/app/services/page_service.rb index 836fd8242..90249b7f3 100644 --- a/app/services/page_service.rb +++ b/app/services/page_service.rb @@ -4,7 +4,8 @@ require 'uri' class PageService def self.get_deploykey() - @deploy_key = EduSetting.find_by_name("site_page_deploy_key").value + @deploy_key = EduSetting.find_by_name("site_page_deploy_key").try(:value) + @deploy_domain = EduSetting.find_by_name("site_page_deploy_domain").try(:value) end @@ -13,7 +14,7 @@ class PageService Rails.logger.info "################### PageService genernate_user #{user_id}" user = User.find user_id if user.id_card_verify == true && user.website_permission == true - uri = URI.parse("http://gitlink.kingchan.cn/gitlink_execute_script?key=#{@deploy_key}&script_path=create_dir&owner=#{user.login.downcase}") + uri = URI.parse("http://gitlink.#{@deploy_domain}/gitlink_execute_script?key=#{@deploy_key}&script_path=create_dir&owner=#{user.login.downcase}") response = Net::HTTP.get_response(uri) end Rails.logger.info "################### PageService genernate_user end #{response.body}" @@ -25,9 +26,9 @@ class PageService Rails.logger.info "################### PageService close_site #{user_id} / #{identifier}" user = User.find user_id uri = if identifier.present? - URI.parse("http://gitlink.kingchan.cn/gitlink_execute_script?key=#{@deploy_key}&script_path=remove_dir&owner=#{user.login.downcase}/#{identifier}/") + URI.parse("http://gitlink.#{@deploy_domain}/gitlink_execute_script?key=#{@deploy_key}&script_path=remove_dir&owner=#{user.login.downcase}/#{identifier}/") else - URI.parse("http://gitlink.kingchan.cn/gitlink_execute_script?key=#{@deploy_key}&script_path=remove_dir&owner=#{user.login.downcase}/") + URI.parse("http://gitlink.#{@deploy_domain}/gitlink_execute_script?key=#{@deploy_key}&script_path=remove_dir&owner=#{user.login.downcase}/") end response = Net::HTTP.get_response(uri) Rails.logger.info "################### PageService close_site end #{response.body}" @@ -61,7 +62,7 @@ class PageService end if script_path.present? - uri = URI.parse("http://gitlink.kingchan.cn/gitlink_execute_script?key=#{@deploy_key}&script_path=#{script_path}&project_dir=#{project_dir}&repo=#{repo}&repo_link=#{repo_link}&branch=#{branch}&owner=#{owner}") + uri = URI.parse("http://gitlink.#{@deploy_domain}/gitlink_execute_script?key=#{@deploy_key}&script_path=#{script_path}&project_dir=#{project_dir}&repo=#{repo}&repo_link=#{repo_link}&branch=#{branch}&owner=#{owner}") response = Net::HTTP.get_response(uri) Rails.logger.info "################### PageService deploy #{response.body}" return response.body