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

调整部署域名来源，可从全局设置进行调整

This commit is contained in:
呱呱呱 2023-08-31 09:22:41 +08:00
parent 798488e689
commit 71fd9969cb
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/page.rb
View File

@ -43,7 +43,8 @@ class Page < ApplicationRecord
end end
def url 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
end end

11
app/services/page_service.rb
View File

@ -4,7 +4,8 @@ require 'uri'
class PageService class PageService
def self.get_deploykey() 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 end
@ -13,7 +14,7 @@ class PageService
Rails.logger.info "################### PageService genernate_user #{user_id}" Rails.logger.info "################### PageService genernate_user #{user_id}"
user = User.find user_id user = User.find user_id
if user.id_card_verify == true && user.website_permission == true 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) response = Net::HTTP.get_response(uri)
end end
Rails.logger.info "################### PageService genernate_user end #{response.body}" Rails.logger.info "################### PageService genernate_user end #{response.body}"
@ -25,9 +26,9 @@ class PageService
Rails.logger.info "################### PageService close_site #{user_id} / #{identifier}" Rails.logger.info "################### PageService close_site #{user_id} / #{identifier}"
user = User.find user_id user = User.find user_id
uri = if identifier.present? 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 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 end
response = Net::HTTP.get_response(uri) response = Net::HTTP.get_response(uri)
Rails.logger.info "################### PageService close_site end #{response.body}" Rails.logger.info "################### PageService close_site end #{response.body}"
@ -61,7 +62,7 @@ class PageService
end end
if script_path.present? 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) response = Net::HTTP.get_response(uri)
Rails.logger.info "################### PageService deploy #{response.body}" Rails.logger.info "################### PageService deploy #{response.body}"
return response.body return response.body