|
|
@ -80,14 +80,14 @@ class GamesService
|
|
|
|
if shixun.vnc
|
|
|
|
if shixun.vnc
|
|
|
|
begin
|
|
|
|
begin
|
|
|
|
shixun_tomcat = Redmine::Configuration['shixun_tomcat']
|
|
|
|
shixun_tomcat = Redmine::Configuration['shixun_tomcat']
|
|
|
|
service_host = Redmine::Configuration['tomcat_php']
|
|
|
|
service_host = Redmine::Configuration['vnc_url']
|
|
|
|
uri = "#{shixun_tomcat}/bridge/vnc/getvnc"
|
|
|
|
uri = "#{shixun_tomcat}/bridge/vnc/getvnc"
|
|
|
|
params = {tpiID: myshixun.id, :containers => "#{Base64.urlsafe_encode64(container_limit(shixun.mirror_repositories))}"}
|
|
|
|
params = {tpiID: myshixun.id, :containers => "#{Base64.urlsafe_encode64(container_limit(shixun.mirror_repositories))}"}
|
|
|
|
res = uri_exec uri, params
|
|
|
|
res = uri_exec uri, params
|
|
|
|
if res && res['code'].to_i != 0
|
|
|
|
if res && res['code'].to_i != 0
|
|
|
|
raise("实训云平台繁忙(繁忙等级:99)")
|
|
|
|
raise("实训云平台繁忙(繁忙等级:99)")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
url = "#{service_host}" +":#{res['port']}/vnc_lite.html?password=headless"
|
|
|
|
url = "https://#{res['port']}.#{service_host}/vnc_lite.html?password=headless"
|
|
|
|
Rails.logger.info("66666666sssssss#{url}")
|
|
|
|
Rails.logger.info("66666666sssssss#{url}")
|
|
|
|
container = container.merge(:vnc_url => url)
|
|
|
|
container = container.merge(:vnc_url => url)
|
|
|
|
Rails.logger.info("777777666sssssss#{container}")
|
|
|
|
Rails.logger.info("777777666sssssss#{container}")
|
|
|
|