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