From 788fa96b14a44bccc6c7eeb75da79efe2bb4b49c Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 6 Jul 2017 16:13:46 +0800
Subject: [PATCH] wenssh

---
 app/controllers/myshixuns_controller.rb |  3 ++-
 app/views/games/_game_webssh.html.erb   |  3 +++
 app/views/games/_repository.html.erb    | 30 ++++++++++++++++++-------
 3 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 app/views/games/_game_webssh.html.erb

diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index 7135bc401..a915daf6d 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -34,7 +34,8 @@ class MyshixunsController < ApplicationController
       render :json => {:host => res['address'], :port => res['port'], :username => username, :password => password}
     rescue Exception => e
       logger.error(e)
-      @message = e.try(:message)
+      render :json => {:error => e.try(:message)}
+     # @message = e.try(:message)
     end
   end
 
diff --git a/app/views/games/_game_webssh.html.erb b/app/views/games/_game_webssh.html.erb
new file mode 100644
index 000000000..c9ea3c760
--- /dev/null
+++ b/app/views/games/_game_webssh.html.erb
@@ -0,0 +1,3 @@
+<iframe src="http://106.75.96.108:9527?Host=10.9.81.28&Port=40012&Username=root&Password=123123" style="width:100%;border: 0;" id="game_webssh">
+
+</iframe>
diff --git a/app/views/games/_repository.html.erb b/app/views/games/_repository.html.erb
index ad68a64c1..f65c57111 100644
--- a/app/views/games/_repository.html.erb
+++ b/app/views/games/_repository.html.erb
@@ -2,7 +2,7 @@
   <li id="codetab_nav_1" class="blacktab_hover" onclick="HoverLi_new(1);">
     <a href="javascript:void(0);" class="tab_type">代码</a>
   </li>
-  <li id="codetab_nav_2" onclick="HoverLi_new(2);">
+  <li id="codetab_nav_2">
     <a href="javascript:void(0);" class="tab_type" >命令行</a>
   </li>
   <div class="fr mt5 -horizontal">
@@ -52,10 +52,8 @@
       </div>
       <div class="-layout-v -fit" id="coding_area">
         <div  class="-flex">
-          <div class="content-editor-inner">
-            <iframe src="http://127.0.0.1:9527?Host=106.75.96.108&Port=30123&Username=root&Password=@pd:lk4+407" width="100%" id="game_webssh">
-
-            </iframe>
+          <div class="content-editor-inner" id="game_webssh">
+            <%#= render :partial => 'games/game_webssh' %>
           </div>
         </div>
       </div>
@@ -63,8 +61,6 @@
   </div>
 </div>
 <script>
-    var h = $("#games_repository_contents").height() - $("#top_repository").height() - 50;
-    $("#game_webssh").css("min-height", h);
     function g_l(o){return document.getElementById(o);}
     function HoverLi_new(n){
         for(var i=1;i<=2;i++){
@@ -73,5 +69,23 @@
         }
         g_l('codotab_con_'+n).className='dis';
         g_l('codetab_nav_'+n).className='blacktab_hover';
-    }
+    };
+    $('#codetab_nav_2').on("click", function(){
+        $.ajax({
+            url: "<%= open_webssh_myshixun_path %>",
+            success: function(data){
+                console.log(data);
+                if(data.error){
+                    return;
+                }else{
+                    var html = "<iframe src='http://106.75.96.108:9527?Host=" + data.host + "&Port=" + data.port + "&Username=" + data.username + "&Password=" + data.password + "'" + "style='width:100%;border:0;' id='game_webssh'></iframe>";
+                    $("#codotab_con_2").html(html);
+                    var h = $("#games_repository_contents").height() - $("#top_repository").height() - 10;
+                    $("#game_webssh").css("min-height", h);
+                    HoverLi_new(2);
+                }
+            }
+        })
+
+    });
 </script>
\ No newline at end of file