From cd7db688d2d9d58e74c950017dd734b146f02b8c Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 17 Jun 2019 10:19:25 +0800
Subject: [PATCH] =?UTF-8?q?vnc=E7=9A=84url=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/myshixuns_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index 96f45d3a..68e4b4b0 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -358,7 +358,7 @@ class MyshixunsController < ApplicationController
   def vnc
     vnc_password = Redmine::Configuration['vnc']
     shixun_tomcat = Redmine::Configuration['shixun_tomcat']
-    host = Redmine::Configuration['tomcat_php']
+    host = Redmine::Configuration['vnc_url']
     begin
     uri = "#{shixun_tomcat}/bridge/vnc/getvnc"
     shixun = @myshixun.shixun
@@ -368,7 +368,7 @@ class MyshixunsController < ApplicationController
       raise("实训云平台繁忙（繁忙等级：99）")
     end
     # url = host + ":" + res['port'] + "?password=" + vnc_password
-    url = host +":#{res['port']}/vnc.html"
+    url = "https://#{res['port']}.#{host}/vnc.html"
     render :json => {:url => url}
     rescue Exception => e
       logger.error(e)