From d912c8d1fdf9234c5ece588fc61e039fc99d1ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 31 Dec 2019 13:50:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/public/index.html | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/public/react/public/index.html b/public/react/public/index.html
index 303128b18..49f6e9fb4 100755
--- a/public/react/public/index.html
+++ b/public/react/public/index.html
@@ -158,6 +158,26 @@
 
     <!-- 在tpi js里加载这3个脚本 -->
     <script>
+      function Return_Reload() {
+
+        var isPageHide = false;
+
+        window.addEventListener('pageshow', function () {
+          if (isPageHide) {
+
+            window.location.reload();
+
+          }
+
+        });
+
+        window.addEventListener('pagehide', function () {
+          isPageHide = true;
+
+        });
+
+      }
+      Return_Reload();
       (function() { // Scoping function to avoid globals
 	    var href = location.href;
         if(window.location.port === "3007"){

From 9360dccc9aa968cba313707c31ec056d4bbb0c8f Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 31 Dec 2019 13:54:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?Jupyter=E5=AE=9E=E8=AE=AD=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/shixuns/create_shixun_service.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/services/shixuns/create_shixun_service.rb b/app/services/shixuns/create_shixun_service.rb
index c85455901..2a66cf2fb 100644
--- a/app/services/shixuns/create_shixun_service.rb
+++ b/app/services/shixuns/create_shixun_service.rb
@@ -26,7 +26,14 @@ class CreateShixunService < ApplicationService
         # 创建镜像
         ShixunMirrorRepository.create!(:shixun_id => shixun.id, :mirror_repository_id => main_mirror.id)
         # 创建主服务配置
-        ShixunServiceConfig.create!(:shixun_id => shixun.id, :mirror_repository_id => main_mirror.id)
+        config_params =
+            if shixun.is_jupyter?
+              {shixun_id: shixun.id, mirror_repository_id: main_mirror.id, cpu_limit: 2,
+               memory_limit: 1024, lower_cpu_limit: 0.2, request_limit: 100}
+            else
+              {shixun_id: shixun.id, mirror_repository_id: main_mirror.id}
+            end
+        ShixunServiceConfig.create!(config_params)
         # 创建子镜像相关数据（实训镜像关联表，子镜像服务配置）
         sub_mirrors.each do |sub|
           ShixunMirrorRepository.create!(:shixun_id => shixun.id, :mirror_repository_id => sub.id)