From 1dfa7a3bf916e6187b91d63f0aa6fa6e3afda98a Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sat, 27 Jul 2019 10:06:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B5=84=E6=BA=90=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E6=B2=A1=E5=80=BC=EF=BC=8C=E5=B0=B1=E4=BC=A0=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index af0158cfd..f01ad4b6b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -442,12 +442,18 @@ class ApplicationController < ActionController::Base
 		shixun.shixun_service_configs.each do |config|
 			mirror = config.mirror_repository
 			if mirror.name.present?
+				# 资源限制没有就传默认值。
+				cpu_limit = config.cpu_limit.presence || 1
+				cpu_request = config.lower_cpu_limit.presence || 0.1
+				memory_limit = config.memory_limit.presence || 1024
+				request_limit = config.resource_limit.presence || 10
+				resource_limit = config.resource_limit.presence || 10000
 				container << {:image => mirror.name,
-											:cpuLimit => config.cpu_limit,
-											:cpuRequest => config.lower_cpu_limit,
-											:memoryLimit => "#{config.memory_limit}M",
-											:memoryRequest => "#{config.request_limit}M",
-											:resourceLimit => "#{config.resource_limit}K",
+											:cpuLimit => cpu_limit,
+											:cpuRequest => cpu_request,
+											:memoryLimit => "#{memory_limit}M",
+											:memoryRequest => "#{request_limit}M",
+											:resourceLimit => "#{resource_limit}K",
 											:type => mirror.try(:main_type) == "1" ? "main" : "sub"}
 			end
 		end

From d65bb1cb0366b1dc3ccfdd4ea816317d26c7bc3b Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sat, 27 Jul 2019 11:53:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8F=AA=E6=9C=89=E7=AE=A1=E7=90=86=E5=91=98=E8=83=BD=E5=A4=9F?=
 =?UTF-8?q?=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/edu_settings_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/edu_settings_controller.rb b/app/controllers/edu_settings_controller.rb
index 0d80cbf3d..6baf38e5b 100644
--- a/app/controllers/edu_settings_controller.rb
+++ b/app/controllers/edu_settings_controller.rb
@@ -1,5 +1,5 @@
 class EduSettingsController < ApplicationController
-  # before_action :require_admin
+  before_action :require_admin
   before_action :set_edu_setting, only: [:show, :edit, :update, :destroy]
 
   # GET /edu_settings